From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Date: Fri, 29 May 2015 00:54:12 +0000 Subject: [PATCH 04/10] ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec,spi-nor" Message-Id: List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org From: Geert Uytterhoeven 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 --- arch/arm/boot/dts/r8a7791-henninger.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts index bb80122b4113..655d1804e5e9 100644 --- a/arch/arm/boot/dts/r8a7791-henninger.dts +++ b/arch/arm/boot/dts/r8a7791-henninger.dts @@ -226,7 +226,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spansion,s25fl512s", "nor-jedec"; + compatible = "spansion,s25fl512s", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <30000000>; spi-tx-bus-width = <4>; -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: horms+renesas@verge.net.au (Simon Horman) Date: Fri, 29 May 2015 09:54:12 +0900 Subject: [PATCH 04/10] ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec, spi-nor" In-Reply-To: References: Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Geert Uytterhoeven 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 --- arch/arm/boot/dts/r8a7791-henninger.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts index bb80122b4113..655d1804e5e9 100644 --- a/arch/arm/boot/dts/r8a7791-henninger.dts +++ b/arch/arm/boot/dts/r8a7791-henninger.dts @@ -226,7 +226,7 @@ flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spansion,s25fl512s", "nor-jedec"; + compatible = "spansion,s25fl512s", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <30000000>; spi-tx-bus-width = <4>; -- 2.1.4