From: Geert Uytterhoeven Date: Wed, 20 May 2015 18:16:50 +0000 (+0200) Subject: ARM: shmobile: bockw-reference dts: Replace "nor-jedec" by "jedec,spi-nor" X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=49633bbbebcd2e398799389542d621bd9b8c5c56;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git ARM: shmobile: bockw-reference dts: Replace "nor-jedec" by "jedec,spi-nor" Cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace "nor-jedec" binding with "jedec, spi-nor"') Signed-off-by: Geert Uytterhoeven Acked-by: Brian Norris Signed-off-by: Simon Horman --- diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts index f9422d887b44..dffa6ff30360 100644 --- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts +++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts @@ -119,7 +119,7 @@ flash: flash@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spansion,s25fl008k", "nor-jedec"; + compatible = "spansion,s25fl008k", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <104000000>; m25p,fast-read;