aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-10-08 03:24:22 -0400
committerKumar Gala <galak@kernel.crashing.org>2007-10-08 14:31:41 -0400
commitdcccb37e98e0444b0c6a03b303855771aa463c96 (patch)
treed25039f1a856b27293f3242171129b7fac8fa01f /arch/powerpc/boot
parent082ea86fce463f8c2f1ce059cc959f21dc1ef24a (diff)
[POWERPC] Lite5200: Use comma delimiter format for lists in device tree
DTC now supports "foo","bar" format for lists of strings; use the new format on the lite5200 device trees. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/dts/lite5200.dts10
-rw-r--r--arch/powerpc/boot/dts/lite5200b.dts62
2 files changed, 36 insertions, 36 deletions
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index 324e1bd2aa60..bc45f5fbb060 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -19,7 +19,7 @@
19/ { 19/ {
20 model = "fsl,lite5200"; 20 model = "fsl,lite5200";
21 // revision = "1.0"; 21 // revision = "1.0";
22 compatible = "fsl,lite5200\0generic-mpc5200"; 22 compatible = "fsl,lite5200","generic-mpc5200";
23 #address-cells = <1>; 23 #address-cells = <1>;
24 #size-cells = <1>; 24 #size-cells = <1>;
25 25
@@ -192,7 +192,7 @@
192 192
193 usb@1000 { 193 usb@1000 {
194 device_type = "usb-ohci-be"; 194 device_type = "usb-ohci-be";
195 compatible = "mpc5200-ohci\0ohci-be"; 195 compatible = "mpc5200-ohci","ohci-be";
196 reg = <1000 ff>; 196 reg = <1000 ff>;
197 interrupts = <2 6 0>; 197 interrupts = <2 6 0>;
198 interrupt-parent = <&mpc5200_pic>; 198 interrupt-parent = <&mpc5200_pic>;
@@ -293,7 +293,7 @@
293 293
294 i2c@3d00 { 294 i2c@3d00 {
295 device_type = "i2c"; 295 device_type = "i2c";
296 compatible = "mpc5200-i2c\0fsl-i2c"; 296 compatible = "mpc5200-i2c","fsl-i2c";
297 cell-index = <0>; 297 cell-index = <0>;
298 reg = <3d00 40>; 298 reg = <3d00 40>;
299 interrupts = <2 f 0>; 299 interrupts = <2 f 0>;
@@ -303,7 +303,7 @@
303 303
304 i2c@3d40 { 304 i2c@3d40 {
305 device_type = "i2c"; 305 device_type = "i2c";
306 compatible = "mpc5200-i2c\0fsl-i2c"; 306 compatible = "mpc5200-i2c","fsl-i2c";
307 cell-index = <1>; 307 cell-index = <1>;
308 reg = <3d40 40>; 308 reg = <3d40 40>;
309 interrupts = <2 10 0>; 309 interrupts = <2 10 0>;
@@ -312,7 +312,7 @@
312 }; 312 };
313 sram@8000 { 313 sram@8000 {
314 device_type = "sram"; 314 device_type = "sram";
315 compatible = "mpc5200-sram\0sram"; 315 compatible = "mpc5200-sram","sram";
316 reg = <8000 4000>; 316 reg = <8000 4000>;
317 }; 317 };
318 }; 318 };
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 3f74f73f70ad..a6bb1d0558ef 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -19,7 +19,7 @@
19/ { 19/ {
20 model = "fsl,lite5200b"; 20 model = "fsl,lite5200b";
21 // revision = "1.0"; 21 // revision = "1.0";
22 compatible = "fsl,lite5200b\0generic-mpc5200"; 22 compatible = "fsl,lite5200b","generic-mpc5200";
23 #address-cells = <1>; 23 #address-cells = <1>;
24 #size-cells = <1>; 24 #size-cells = <1>;
25 25
@@ -56,7 +56,7 @@
56 system-frequency = <0>; // from bootloader 56 system-frequency = <0>; // from bootloader
57 57
58 cdm@200 { 58 cdm@200 {
59 compatible = "mpc5200b-cdm\0mpc5200-cdm"; 59 compatible = "mpc5200b-cdm","mpc5200-cdm";
60 reg = <200 38>; 60 reg = <200 38>;
61 }; 61 };
62 62
@@ -65,12 +65,12 @@
65 interrupt-controller; 65 interrupt-controller;
66 #interrupt-cells = <3>; 66 #interrupt-cells = <3>;
67 device_type = "interrupt-controller"; 67 device_type = "interrupt-controller";
68 compatible = "mpc5200b-pic\0mpc5200-pic"; 68 compatible = "mpc5200b-pic","mpc5200-pic";
69 reg = <500 80>; 69 reg = <500 80>;
70 }; 70 };
71 71
72 gpt@600 { // General Purpose Timer 72 gpt@600 { // General Purpose Timer
73 compatible = "mpc5200b-gpt\0mpc5200-gpt"; 73 compatible = "mpc5200b-gpt","mpc5200-gpt";
74 device_type = "gpt"; 74 device_type = "gpt";
75 cell-index = <0>; 75 cell-index = <0>;
76 reg = <600 10>; 76 reg = <600 10>;
@@ -80,7 +80,7 @@
80 }; 80 };
81 81
82 gpt@610 { // General Purpose Timer 82 gpt@610 { // General Purpose Timer
83 compatible = "mpc5200b-gpt\0mpc5200-gpt"; 83 compatible = "mpc5200b-gpt","mpc5200-gpt";
84 device_type = "gpt"; 84 device_type = "gpt";
85 cell-index = <1>; 85 cell-index = <1>;
86 reg = <610 10>; 86 reg = <610 10>;
@@ -89,7 +89,7 @@
89 }; 89 };
90 90
91 gpt@620 { // General Purpose Timer 91 gpt@620 { // General Purpose Timer
92 compatible = "mpc5200b-gpt\0mpc5200-gpt"; 92 compatible = "mpc5200b-gpt","mpc5200-gpt";
93 device_type = "gpt"; 93 device_type = "gpt";
94 cell-index = <2>; 94 cell-index = <2>;
95 reg = <620 10>; 95 reg = <620 10>;
@@ -98,7 +98,7 @@
98 }; 98 };
99 99
100 gpt@630 { // General Purpose Timer 100 gpt@630 { // General Purpose Timer
101 compatible = "mpc5200b-gpt\0mpc5200-gpt"; 101 compatible = "mpc5200b-gpt","mpc5200-gpt";
102 device_type = "gpt"; 102 device_type = "gpt";
103 cell-index = <3>; 103 cell-index = <3>;
104 reg = <630 10>; 104 reg = <630 10>;
@@ -107,7 +107,7 @@
107 }; 107 };
108 108
109 gpt@640 { // General Purpose Timer 109 gpt@640 { // General Purpose Timer
110 compatible = "mpc5200b-gpt\0mpc5200-gpt"; 110 compatible = "mpc5200b-gpt","mpc5200-gpt";
111 device_type = "gpt"; 111 device_type = "gpt";
112 cell-index = <4>; 112 cell-index = <4>;
113 reg = <640 10>; 113 reg = <640 10>;
@@ -116,7 +116,7 @@
116 }; 116 };
117 117
118 gpt@650 { // General Purpose Timer 118 gpt@650 { // General Purpose Timer
119 compatible = "mpc5200b-gpt\0mpc5200-gpt"; 119 compatible = "mpc5200b-gpt","mpc5200-gpt";
120 device_type = "gpt"; 120 device_type = "gpt";
121 cell-index = <5>; 121 cell-index = <5>;
122 reg = <650 10>; 122 reg = <650 10>;
@@ -125,7 +125,7 @@
125 }; 125 };
126 126
127 gpt@660 { // General Purpose Timer 127 gpt@660 { // General Purpose Timer
128 compatible = "mpc5200b-gpt\0mpc5200-gpt"; 128 compatible = "mpc5200b-gpt","mpc5200-gpt";
129 device_type = "gpt"; 129 device_type = "gpt";
130 cell-index = <6>; 130 cell-index = <6>;
131 reg = <660 10>; 131 reg = <660 10>;
@@ -134,7 +134,7 @@
134 }; 134 };
135 135
136 gpt@670 { // General Purpose Timer 136 gpt@670 { // General Purpose Timer
137 compatible = "mpc5200b-gpt\0mpc5200-gpt"; 137 compatible = "mpc5200b-gpt","mpc5200-gpt";
138 device_type = "gpt"; 138 device_type = "gpt";
139 cell-index = <7>; 139 cell-index = <7>;
140 reg = <670 10>; 140 reg = <670 10>;
@@ -143,7 +143,7 @@
143 }; 143 };
144 144
145 rtc@800 { // Real time clock 145 rtc@800 { // Real time clock
146 compatible = "mpc5200b-rtc\0mpc5200-rtc"; 146 compatible = "mpc5200b-rtc","mpc5200-rtc";
147 device_type = "rtc"; 147 device_type = "rtc";
148 reg = <800 100>; 148 reg = <800 100>;
149 interrupts = <1 5 0 1 6 0>; 149 interrupts = <1 5 0 1 6 0>;
@@ -152,7 +152,7 @@
152 152
153 mscan@900 { 153 mscan@900 {
154 device_type = "mscan"; 154 device_type = "mscan";
155 compatible = "mpc5200b-mscan\0mpc5200-mscan"; 155 compatible = "mpc5200b-mscan","mpc5200-mscan";
156 cell-index = <0>; 156 cell-index = <0>;
157 interrupts = <2 11 0>; 157 interrupts = <2 11 0>;
158 interrupt-parent = <&mpc5200_pic>; 158 interrupt-parent = <&mpc5200_pic>;
@@ -161,7 +161,7 @@
161 161
162 mscan@980 { 162 mscan@980 {
163 device_type = "mscan"; 163 device_type = "mscan";
164 compatible = "mpc5200b-mscan\0mpc5200-mscan"; 164 compatible = "mpc5200b-mscan","mpc5200-mscan";
165 cell-index = <1>; 165 cell-index = <1>;
166 interrupts = <2 12 0>; 166 interrupts = <2 12 0>;
167 interrupt-parent = <&mpc5200_pic>; 167 interrupt-parent = <&mpc5200_pic>;
@@ -169,14 +169,14 @@
169 }; 169 };
170 170
171 gpio@b00 { 171 gpio@b00 {
172 compatible = "mpc5200b-gpio\0mpc5200-gpio"; 172 compatible = "mpc5200b-gpio","mpc5200-gpio";
173 reg = <b00 40>; 173 reg = <b00 40>;
174 interrupts = <1 7 0>; 174 interrupts = <1 7 0>;
175 interrupt-parent = <&mpc5200_pic>; 175 interrupt-parent = <&mpc5200_pic>;
176 }; 176 };
177 177
178 gpio-wkup@c00 { 178 gpio-wkup@c00 {
179 compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup"; 179 compatible = "mpc5200b-gpio-wkup","mpc5200-gpio-wkup";
180 reg = <c00 40>; 180 reg = <c00 40>;
181 interrupts = <1 8 0 0 3 0>; 181 interrupts = <1 8 0 0 3 0>;
182 interrupt-parent = <&mpc5200_pic>; 182 interrupt-parent = <&mpc5200_pic>;
@@ -184,7 +184,7 @@
184 184
185 spi@f00 { 185 spi@f00 {
186 device_type = "spi"; 186 device_type = "spi";
187 compatible = "mpc5200b-spi\0mpc5200-spi"; 187 compatible = "mpc5200b-spi","mpc5200-spi";
188 reg = <f00 20>; 188 reg = <f00 20>;
189 interrupts = <2 d 0 2 e 0>; 189 interrupts = <2 d 0 2 e 0>;
190 interrupt-parent = <&mpc5200_pic>; 190 interrupt-parent = <&mpc5200_pic>;
@@ -192,7 +192,7 @@
192 192
193 usb@1000 { 193 usb@1000 {
194 device_type = "usb-ohci-be"; 194 device_type = "usb-ohci-be";
195 compatible = "mpc5200b-ohci\0mpc5200-ohci\0ohci-be"; 195 compatible = "mpc5200b-ohci","mpc5200-ohci","ohci-be";
196 reg = <1000 ff>; 196 reg = <1000 ff>;
197 interrupts = <2 6 0>; 197 interrupts = <2 6 0>;
198 interrupt-parent = <&mpc5200_pic>; 198 interrupt-parent = <&mpc5200_pic>;
@@ -200,7 +200,7 @@
200 200
201 bestcomm@1200 { 201 bestcomm@1200 {
202 device_type = "dma-controller"; 202 device_type = "dma-controller";
203 compatible = "mpc5200b-bestcomm\0mpc5200-bestcomm"; 203 compatible = "mpc5200b-bestcomm","mpc5200-bestcomm";
204 reg = <1200 80>; 204 reg = <1200 80>;
205 interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 205 interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
206 3 4 0 3 5 0 3 6 0 3 7 0 206 3 4 0 3 5 0 3 6 0 3 7 0
@@ -210,13 +210,13 @@
210 }; 210 };
211 211
212 xlb@1f00 { 212 xlb@1f00 {
213 compatible = "mpc5200b-xlb\0mpc5200-xlb"; 213 compatible = "mpc5200b-xlb","mpc5200-xlb";
214 reg = <1f00 100>; 214 reg = <1f00 100>;
215 }; 215 };
216 216
217 serial@2000 { // PSC1 217 serial@2000 { // PSC1
218 device_type = "serial"; 218 device_type = "serial";
219 compatible = "mpc5200b-psc-uart\0mpc5200-psc-uart"; 219 compatible = "mpc5200b-psc-uart","mpc5200-psc-uart";
220 port-number = <0>; // Logical port assignment 220 port-number = <0>; // Logical port assignment
221 cell-index = <0>; 221 cell-index = <0>;
222 reg = <2000 100>; 222 reg = <2000 100>;
@@ -227,7 +227,7 @@
227 // PSC2 in ac97 mode example 227 // PSC2 in ac97 mode example
228 //ac97@2200 { // PSC2 228 //ac97@2200 { // PSC2
229 // device_type = "sound"; 229 // device_type = "sound";
230 // compatible = "mpc5200b-psc-ac97\0mpc5200-psc-ac97"; 230 // compatible = "mpc5200b-psc-ac97","mpc5200-psc-ac97";
231 // cell-index = <1>; 231 // cell-index = <1>;
232 // reg = <2200 100>; 232 // reg = <2200 100>;
233 // interrupts = <2 2 0>; 233 // interrupts = <2 2 0>;
@@ -247,7 +247,7 @@
247 // PSC4 in uart mode example 247 // PSC4 in uart mode example
248 //serial@2600 { // PSC4 248 //serial@2600 { // PSC4
249 // device_type = "serial"; 249 // device_type = "serial";
250 // compatible = "mpc5200b-psc-uart\0mpc5200-psc-uart"; 250 // compatible = "mpc5200b-psc-uart","mpc5200-psc-uart";
251 // cell-index = <3>; 251 // cell-index = <3>;
252 // reg = <2600 100>; 252 // reg = <2600 100>;
253 // interrupts = <2 b 0>; 253 // interrupts = <2 b 0>;
@@ -257,7 +257,7 @@
257 // PSC5 in uart mode example 257 // PSC5 in uart mode example
258 //serial@2800 { // PSC5 258 //serial@2800 { // PSC5
259 // device_type = "serial"; 259 // device_type = "serial";
260 // compatible = "mpc5200b-psc-uart\0mpc5200-psc-uart"; 260 // compatible = "mpc5200b-psc-uart","mpc5200-psc-uart";
261 // cell-index = <4>; 261 // cell-index = <4>;
262 // reg = <2800 100>; 262 // reg = <2800 100>;
263 // interrupts = <2 c 0>; 263 // interrupts = <2 c 0>;
@@ -267,7 +267,7 @@
267 // PSC6 in spi mode example 267 // PSC6 in spi mode example
268 //spi@2c00 { // PSC6 268 //spi@2c00 { // PSC6
269 // device_type = "spi"; 269 // device_type = "spi";
270 // compatible = "mpc5200b-psc-spi\0mpc5200-psc-spi"; 270 // compatible = "mpc5200b-psc-spi","mpc5200-psc-spi";
271 // cell-index = <5>; 271 // cell-index = <5>;
272 // reg = <2c00 100>; 272 // reg = <2c00 100>;
273 // interrupts = <2 4 0>; 273 // interrupts = <2 4 0>;
@@ -276,7 +276,7 @@
276 276
277 ethernet@3000 { 277 ethernet@3000 {
278 device_type = "network"; 278 device_type = "network";
279 compatible = "mpc5200b-fec\0mpc5200-fec"; 279 compatible = "mpc5200b-fec","mpc5200-fec";
280 reg = <3000 800>; 280 reg = <3000 800>;
281 mac-address = [ 02 03 04 05 06 07 ]; // Bad! 281 mac-address = [ 02 03 04 05 06 07 ]; // Bad!
282 interrupts = <2 5 0>; 282 interrupts = <2 5 0>;
@@ -285,7 +285,7 @@
285 285
286 ata@3a00 { 286 ata@3a00 {
287 device_type = "ata"; 287 device_type = "ata";
288 compatible = "mpc5200b-ata\0mpc5200-ata"; 288 compatible = "mpc5200b-ata","mpc5200-ata";
289 reg = <3a00 100>; 289 reg = <3a00 100>;
290 interrupts = <2 7 0>; 290 interrupts = <2 7 0>;
291 interrupt-parent = <&mpc5200_pic>; 291 interrupt-parent = <&mpc5200_pic>;
@@ -293,7 +293,7 @@
293 293
294 i2c@3d00 { 294 i2c@3d00 {
295 device_type = "i2c"; 295 device_type = "i2c";
296 compatible = "mpc5200b-i2c\0mpc5200-i2c\0fsl-i2c"; 296 compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
297 cell-index = <0>; 297 cell-index = <0>;
298 reg = <3d00 40>; 298 reg = <3d00 40>;
299 interrupts = <2 f 0>; 299 interrupts = <2 f 0>;
@@ -303,7 +303,7 @@
303 303
304 i2c@3d40 { 304 i2c@3d40 {
305 device_type = "i2c"; 305 device_type = "i2c";
306 compatible = "mpc5200b-i2c\0mpc5200-i2c\0fsl-i2c"; 306 compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
307 cell-index = <1>; 307 cell-index = <1>;
308 reg = <3d40 40>; 308 reg = <3d40 40>;
309 interrupts = <2 10 0>; 309 interrupts = <2 10 0>;
@@ -312,7 +312,7 @@
312 }; 312 };
313 sram@8000 { 313 sram@8000 {
314 device_type = "sram"; 314 device_type = "sram";
315 compatible = "mpc5200b-sram\0mpc5200-sram\0sram"; 315 compatible = "mpc5200b-sram","mpc5200-sram","sram";
316 reg = <8000 4000>; 316 reg = <8000 4000>;
317 }; 317 };
318 }; 318 };
@@ -322,7 +322,7 @@
322 #size-cells = <2>; 322 #size-cells = <2>;
323 #address-cells = <3>; 323 #address-cells = <3>;
324 device_type = "pci"; 324 device_type = "pci";
325 compatible = "mpc5200b-pci\0mpc5200-pci"; 325 compatible = "mpc5200b-pci","mpc5200-pci";
326 reg = <f0000d00 100>; 326 reg = <f0000d00 100>;
327 interrupt-map-mask = <f800 0 0 7>; 327 interrupt-map-mask = <f800 0 0 7>;
328 interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot 328 interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-11 03:56:13 -0500