[PATCH 0/5] ARM: shmobile: dts: Replace "nor-jedec" by "jedec, spi-nor"

[PATCH 0/5] ARM: shmobile: dts: Replace "nor-jedec" by "jedec, spi-nor"

[Geert Uytterhoeven]

	Hi Simon, Magnus,

This patch series replaces the recently introduced "nor-jedec"
compatible value by "jedec,spi-nor" in all shmobile dts files,
cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace
"nor-jedec" binding with "jedec,spi-nor"'), which was applied in
v4.1-rc4.

As the "bad" compatible values are already in -next for v4.2, these
updates should be applied and queued for v4.2, too.

Thanks for applying!

Geert Uytterhoeven (5):
  ARM: shmobile: bockw-reference dts: Replace "nor-jedec" by
    "jedec,spi-nor"
  ARM: shmobile: bockw dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: lager dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: koelsch dts: Replace "nor-jedec" by "jedec,spi-nor"

 arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +-
 arch/arm/boot/dts/r8a7778-bockw.dts           | 2 +-
 arch/arm/boot/dts/r8a7790-lager.dts           | 2 +-
 arch/arm/boot/dts/r8a7791-henninger.dts       | 2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

[PATCH 1/5] ARM: shmobile: bockw-reference dts: Replace "nor-jedec" by "jedec, spi-nor"

[Geert Uytterhoeven]

Cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace
"nor-jedec" binding with "jedec, spi-nor"')

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index f9422d887b4441c3..dffa6ff303608b19 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 at 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;
-- 
1.9.1

[PATCH 2/5] ARM: shmobile: bockw dts: Replace "nor-jedec" by "jedec, spi-nor"

[Geert Uytterhoeven]

Cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace
"nor-jedec" binding with "jedec, spi-nor"')

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7778-bockw.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index dfbb12e4fef4ee52..90543b12d7e26bcb 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -186,7 +186,7 @@
 	flash: flash at 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;
-- 
1.9.1

[PATCH 3/5] ARM: shmobile: lager dts: Replace "nor-jedec" by "jedec, spi-nor"

[Geert Uytterhoeven]

Cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace
"nor-jedec" binding with "jedec, spi-nor"')

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index b6cffcedd1162165..2eb8a995ae9fe6fa 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -429,7 +429,7 @@
 	flash: 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>;
-- 
1.9.1

[PATCH 4/5] ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec, spi-nor"

[Geert Uytterhoeven]

Cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace
"nor-jedec" binding with "jedec, spi-nor"')

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 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 bb80122b4113bd8a..655d1804e5e9ceda 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>;
-- 
1.9.1

[PATCH 5/5] ARM: shmobile: koelsch dts: Replace "nor-jedec" by "jedec, spi-nor"

[Geert Uytterhoeven]

Cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace
"nor-jedec" binding with "jedec, spi-nor"')

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index e9c24036f00027c9..cffe33ff4d16f41f 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -474,7 +474,7 @@
 	flash: 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>;
-- 
1.9.1

[PATCH 0/5] ARM: shmobile: dts: Replace "nor-jedec" by "jedec,spi-nor"

[Brian Norris]

+ linux-mtd, FYI

On Wed, May 20, 2015 at 08:16:49PM +0200, Geert Uytterhoeven wrote:
> 	Hi Simon, Magnus,
> 
> This patch series replaces the recently introduced "nor-jedec"
> compatible value by "jedec,spi-nor" in all shmobile dts files,
> cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace
> "nor-jedec" binding with "jedec,spi-nor"'), which was applied in
> v4.1-rc4.
> 
> As the "bad" compatible values are already in -next for v4.2, these
> updates should be applied and queued for v4.2, too.
> 
> Thanks for applying!

For the series:

Acked-by: Brian Norris <computersforpeace@gmail.com>

Thanks Geert!

[PATCH 0/5] ARM: shmobile: dts: Replace "nor-jedec" by "jedec,spi-nor"

[Simon Horman]

Hi Geert,

On Wed, May 20, 2015 at 11:41:50AM -0700, Brian Norris wrote:
> + linux-mtd, FYI
> 
> On Wed, May 20, 2015 at 08:16:49PM +0200, Geert Uytterhoeven wrote:
> > 	Hi Simon, Magnus,
> > 
> > This patch series replaces the recently introduced "nor-jedec"
> > compatible value by "jedec,spi-nor" in all shmobile dts files,
> > cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace
> > "nor-jedec" binding with "jedec,spi-nor"'), which was applied in
> > v4.1-rc4.
> > 
> > As the "bad" compatible values are already in -next for v4.2, these
> > updates should be applied and queued for v4.2, too.
> > 
> > Thanks for applying!
> 
> For the series:
> 
> Acked-by: Brian Norris <computersforpeace@gmail.com>
> 
> Thanks Geert!

thanks for following up on this. I have queued these up for v4.2
on top of the patches which add usage of the "bad" values.