Skip to contentSkip to conversation

SPI: Use fsl_spi instead of mpc83xx_spi

PATCH In review Peter Korsgaard 3 participants 4 messages Oct 3, 2007 – Oct 4, 2007

Subsystems (2)
Device tree bindings PowerPC
lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/1 SPI: Use fsl_spi instead of mpc83xx_spi

According to booting-without-of.txt, compatible should be "fsl_spi" and mode "cpu" or "qe" for the fsl SPI controllers.

Signed-off-by Peter Korsgaard <[email protected]>
---
 arch/powerpc/boot/dts/mpc8313erdb.dts    |    4 ++--
 arch/powerpc/boot/dts/mpc8349emitx.dts   |    4 ++--
 arch/powerpc/boot/dts/mpc8349emitxgp.dts |    4 ++--
 arch/powerpc/boot/dts/mpc834x_mds.dts    |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/boot/dts/mpc8313erdb.dts +2 -2
index a8eadc8..9e7eba9 100644
@@ -71,11 +71,11 @@
 
 		spi@7000 {
 			device_type = "spi";
-			compatible = "mpc83xx_spi";
+			compatible = "fsl_spi";
 			reg = <7000 1000>;
 			interrupts = <10 8>;
 			interrupt-parent = < &ipic >;
-			mode = <0>;
+			mode = "cpu";
 		};
 
 		/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
arch/powerpc/boot/dts/mpc8349emitx.dts +2 -2
index e0cb2a7..b2b3995 100644
@@ -70,11 +70,11 @@
 
 		spi@7000 {
 			device_type = "spi";
-			compatible = "mpc83xx_spi";
+			compatible = "fsl_spi";
 			reg = <7000 1000>;
 			interrupts = <10 8>;
 			interrupt-parent = < &ipic >;
-			mode = <0>;
+			mode = "cpu";
 		};
 
 		usb@22000 {
arch/powerpc/boot/dts/mpc8349emitxgp.dts +2 -2
index fa852ba..cf8c72a 100644
@@ -70,11 +70,11 @@
 
 		spi@7000 {
 			device_type = "spi";
-			compatible = "mpc83xx_spi";
+			compatible = "fsl_spi";
 			reg = <7000 1000>;
 			interrupts = <10 8>;
 			interrupt-parent = < &ipic >;
-			mode = <0>;
+			mode = "cpu";
 		};
 
 		usb@23000 {
arch/powerpc/boot/dts/mpc834x_mds.dts +2 -2
index 1b8882e..cf7b84f 100644
@@ -76,11 +76,11 @@
 
 		spi@7000 {
 			device_type = "spi";
-			compatible = "mpc83xx_spi";
+			compatible = "fsl_spi";
 			reg = <7000 1000>;
 			interrupts = <10 8>;
 			interrupt-parent = < &ipic >;
-			mode = <0>;
+			mode = "cpu";
 		};
 
 		/* phy type (ULPI or SERIAL) are only types supportted for MPH */
Signature · 5 lines
1.5.3.2


-- 
Bye, Peter Korsgaard
#1 lore raw
Quoted 16 lines · Peter Korsgaard

According to booting-without-of.txt, compatible should be "fsl_spi" and mode "cpu" or "qe" for the fsl SPI controllers.

Signed-off-by Peter Korsgaard <[email protected]>
---
 arch/powerpc/boot/dts/mpc8313erdb.dts    |    4 ++--
 arch/powerpc/boot/dts/mpc8349emitx.dts   |    4 ++--
 arch/powerpc/boot/dts/mpc8349emitxgp.dts |    4 ++--
 arch/powerpc/boot/dts/mpc834x_mds.dts    |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/boot/dts/mpc8313erdb.dts +0 -0
index a8eadc8..9e7eba9 100644

arch/powerpc/boot/dts/mpc8313erdb.dts line 74

Quoted 5 lines
arch/powerpc/boot/dts/mpc8313erdb.dts +1 -1
@@ -71,11 +71,11 @@
 
                spi@7000 {
                        device_type = "spi";
-                       compatible = "mpc83xx_spi";
+                       compatible = "fsl_spi";

Compatible is a list property; this might be more appropriate:

compatible = "fsl,mpc8313_spi", "fsl_spi";

Cheers,
g.

Signature · 4 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
[email protected]
(403) 399-0195
author
#2 lore raw
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Grant" == Grant Likely <[email protected]> writes:

Hi,

Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-                       compatible = "mpc83xx_spi";
+                       compatible = "fsl_spi";

Grant> Compatible is a list property; this might be more appropriate:

Grant> compatible = "fsl,mpc8313_spi", "fsl_spi";

Fine by me, I'm just following booting-without-of.txt.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw
Quoted 4 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Grant" == Grant Likely <[email protected]> writes:

Hi,

Quoted 8 lines
Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-                       compatible = "mpc83xx_spi";
+                       compatible = "fsl_spi";

Grant> Compatible is a list property; this might be more appropriate:

Grant> compatible = "fsl,mpc8313_spi", "fsl_spi";

Fine by me, I'm just following booting-without-of.txt.

Yeah, some of the older bits of booting-without-of.txt are a bit crufty. There should certainly be a specific compatible value in the list as well as the general "fsl_spi" one.

Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson