aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2008-01-24 10:40:07 -0500
committerKumar Gala <galak@kernel.crashing.org>2008-01-28 09:32:58 -0500
commitf3a2b29d932fbf92e133d814c4873fd15be51abc (patch)
treedf6c2c960540b0f648d2ae3e3648111d500b97c0 /arch/powerpc/boot
parent59a0ea5091d309fa8338954b84cf5307dbd83ec9 (diff)
[POWERPC] fsl_spi: stop using device_type = "spi"
Also: - rename "fsl_spi" to "fsl,spi"; - add and use cell-index property, if found; - split probing code out of fsl_spi_init, thus we can call it for legacy device_type probing and new "compatible" probing. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/dts/mpc8313erdb.dts4
-rw-r--r--arch/powerpc/boot/dts/mpc832x_mds.dts8
-rw-r--r--arch/powerpc/boot/dts/mpc832x_rdb.dts8
-rw-r--r--arch/powerpc/boot/dts/mpc8349emitx.dts4
-rw-r--r--arch/powerpc/boot/dts/mpc8349emitxgp.dts4
-rw-r--r--arch/powerpc/boot/dts/mpc834x_mds.dts4
-rw-r--r--arch/powerpc/boot/dts/mpc836x_mds.dts8
-rw-r--r--arch/powerpc/boot/dts/mpc8377_mds.dts3
-rw-r--r--arch/powerpc/boot/dts/mpc8378_mds.dts3
-rw-r--r--arch/powerpc/boot/dts/mpc8379_mds.dts3
-rw-r--r--arch/powerpc/boot/dts/mpc8568mds.dts8
-rw-r--r--arch/powerpc/boot/dts/sbc8349.dts3
12 files changed, 32 insertions, 28 deletions
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 9bcf2c92541f..20a03f5b5bb7 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -130,8 +130,8 @@
130 }; 130 };
131 131
132 spi@7000 { 132 spi@7000 {
133 device_type = "spi"; 133 cell-index = <0>;
134 compatible = "fsl_spi"; 134 compatible = "fsl,spi";
135 reg = <7000 1000>; 135 reg = <7000 1000>;
136 interrupts = <10 8>; 136 interrupts = <10 8>;
137 interrupt-parent = < &ipic >; 137 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 1bb75ef389ff..15bb3459ff8a 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -223,8 +223,8 @@
223 }; 223 };
224 224
225 spi@4c0 { 225 spi@4c0 {
226 device_type = "spi"; 226 cell-index = <0>;
227 compatible = "fsl_spi"; 227 compatible = "fsl,spi";
228 reg = <4c0 40>; 228 reg = <4c0 40>;
229 interrupts = <2>; 229 interrupts = <2>;
230 interrupt-parent = < &qeic >; 230 interrupt-parent = < &qeic >;
@@ -232,8 +232,8 @@
232 }; 232 };
233 233
234 spi@500 { 234 spi@500 {
235 device_type = "spi"; 235 cell-index = <1>;
236 compatible = "fsl_spi"; 236 compatible = "fsl,spi";
237 reg = <500 40>; 237 reg = <500 40>;
238 interrupts = <1>; 238 interrupts = <1>;
239 interrupt-parent = < &qeic >; 239 interrupt-parent = < &qeic >;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index f6a86336c8e0..f086fac59219 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -184,8 +184,8 @@
184 }; 184 };
185 185
186 spi@4c0 { 186 spi@4c0 {
187 device_type = "spi"; 187 cell-index = <0>;
188 compatible = "fsl_spi"; 188 compatible = "fsl,spi";
189 reg = <4c0 40>; 189 reg = <4c0 40>;
190 interrupts = <2>; 190 interrupts = <2>;
191 interrupt-parent = <&qeic>; 191 interrupt-parent = <&qeic>;
@@ -193,8 +193,8 @@
193 }; 193 };
194 194
195 spi@500 { 195 spi@500 {
196 device_type = "spi"; 196 cell-index = <1>;
197 compatible = "fsl_spi"; 197 compatible = "fsl,spi";
198 reg = <500 40>; 198 reg = <500 40>;
199 interrupts = <1>; 199 interrupts = <1>;
200 interrupt-parent = <&qeic>; 200 interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 04b8da4deb60..4a4ddea2d99c 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -82,8 +82,8 @@
82 }; 82 };
83 83
84 spi@7000 { 84 spi@7000 {
85 device_type = "spi"; 85 cell-index = <0>;
86 compatible = "fsl_spi"; 86 compatible = "fsl,spi";
87 reg = <7000 1000>; 87 reg = <7000 1000>;
88 interrupts = <10 8>; 88 interrupts = <10 8>;
89 interrupt-parent = < &ipic >; 89 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index a06ff92cf0b1..79983d74eee4 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -80,8 +80,8 @@
80 }; 80 };
81 81
82 spi@7000 { 82 spi@7000 {
83 device_type = "spi"; 83 cell-index = <0>;
84 compatible = "fsl_spi"; 84 compatible = "fsl,spi";
85 reg = <7000 1000>; 85 reg = <7000 1000>;
86 interrupts = <10 8>; 86 interrupts = <10 8>;
87 interrupt-parent = < &ipic >; 87 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index d2c0e8ab8b7c..8faa8bd6ed64 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -95,8 +95,8 @@
95 }; 95 };
96 96
97 spi@7000 { 97 spi@7000 {
98 device_type = "spi"; 98 cell-index = <0>;
99 compatible = "fsl_spi"; 99 compatible = "fsl,spi";
100 reg = <0x7000 0x1000>; 100 reg = <0x7000 0x1000>;
101 interrupts = <16 8>; 101 interrupts = <16 8>;
102 interrupt-parent = <&ipic>; 102 interrupt-parent = <&ipic>;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index fa98bdf0de8c..d3b8262df686 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -225,8 +225,8 @@
225 }; 225 };
226 226
227 spi@4c0 { 227 spi@4c0 {
228 device_type = "spi"; 228 cell-index = <0>;
229 compatible = "fsl_spi"; 229 compatible = "fsl,spi";
230 reg = <4c0 40>; 230 reg = <4c0 40>;
231 interrupts = <2>; 231 interrupts = <2>;
232 interrupt-parent = < &qeic >; 232 interrupt-parent = < &qeic >;
@@ -234,8 +234,8 @@
234 }; 234 };
235 235
236 spi@500 { 236 spi@500 {
237 device_type = "spi"; 237 cell-index = <1>;
238 compatible = "fsl_spi"; 238 compatible = "fsl,spi";
239 reg = <500 40>; 239 reg = <500 40>;
240 interrupts = <1>; 240 interrupts = <1>;
241 interrupt-parent = < &qeic >; 241 interrupt-parent = < &qeic >;
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index 98b46065f45a..3b9611f189e1 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -83,7 +83,8 @@
83 }; 83 };
84 84
85 spi@7000 { 85 spi@7000 {
86 compatible = "fsl_spi"; 86 cell-index = <0>;
87 compatible = "fsl,spi";
87 reg = <0x7000 0x1000>; 88 reg = <0x7000 0x1000>;
88 interrupts = <0x10 0x8>; 89 interrupts = <0x10 0x8>;
89 interrupt-parent = < &ipic >; 90 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts
index c117a6a3a8e6..386f4a037b33 100644
--- a/arch/powerpc/boot/dts/mpc8378_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
@@ -83,7 +83,8 @@
83 }; 83 };
84 84
85 spi@7000 { 85 spi@7000 {
86 compatible = "fsl_spi"; 86 cell-index = <0>;
87 compatible = "fsl,spi";
87 reg = <0x7000 0x1000>; 88 reg = <0x7000 0x1000>;
88 interrupts = <0x10 0x8>; 89 interrupts = <0x10 0x8>;
89 interrupt-parent = < &ipic >; 90 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
index fc3ba79fb684..da9931b6c5c0 100644
--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -83,7 +83,8 @@
83 }; 83 };
84 84
85 spi@7000 { 85 spi@7000 {
86 compatible = "fsl_spi"; 86 cell-index = <0>;
87 compatible = "fsl,spi";
87 reg = <0x7000 0x1000>; 88 reg = <0x7000 0x1000>;
88 interrupts = <0x10 0x8>; 89 interrupts = <0x10 0x8>;
89 interrupt-parent = < &ipic >; 90 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 692d5bd81e70..c929fba7f399 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -302,8 +302,8 @@
302 }; 302 };
303 303
304 spi@4c0 { 304 spi@4c0 {
305 device_type = "spi"; 305 cell-index = <0>;
306 compatible = "fsl_spi"; 306 compatible = "fsl,spi";
307 reg = <4c0 40>; 307 reg = <4c0 40>;
308 interrupts = <2>; 308 interrupts = <2>;
309 interrupt-parent = <&qeic>; 309 interrupt-parent = <&qeic>;
@@ -311,8 +311,8 @@
311 }; 311 };
312 312
313 spi@500 { 313 spi@500 {
314 device_type = "spi"; 314 cell-index = <1>;
315 compatible = "fsl_spi"; 315 compatible = "fsl,spi";
316 reg = <500 40>; 316 reg = <500 40>;
317 interrupts = <1>; 317 interrupts = <1>;
318 interrupt-parent = <&qeic>; 318 interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts
index 9c13c1a99640..0934f54b2b43 100644
--- a/arch/powerpc/boot/dts/sbc8349.dts
+++ b/arch/powerpc/boot/dts/sbc8349.dts
@@ -87,7 +87,8 @@
87 }; 87 };
88 88
89 spi@7000 { 89 spi@7000 {
90 compatible = "fsl_spi"; 90 cell-index = <0>;
91 compatible = "fsl,spi";
91 reg = <0x7000 0x1000>; 92 reg = <0x7000 0x1000>;
92 interrupts = <0x10 0x8>; 93 interrupts = <0x10 0x8>;
93 interrupt-parent = <&ipic>; 94 interrupt-parent = <&ipic>;
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-18 19:06:39 -0500