diff options
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/dts/cm5200.dts | 37 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/lite5200.dts | 15 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/motionpro.dts | 63 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8377_mds.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8377_rdb.dts | 3 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8378_rdb.dts | 3 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8379_mds.dts | 8 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8379_rdb.dts | 3 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/tqm5200.dts | 42 |
9 files changed, 136 insertions, 42 deletions
diff --git a/arch/powerpc/boot/dts/cm5200.dts b/arch/powerpc/boot/dts/cm5200.dts index 30737eafe68e..c6ca6319e4f7 100644 --- a/arch/powerpc/boot/dts/cm5200.dts +++ b/arch/powerpc/boot/dts/cm5200.dts | |||
@@ -212,13 +212,30 @@ | |||
212 | ethernet@3000 { | 212 | ethernet@3000 { |
213 | device_type = "network"; | 213 | device_type = "network"; |
214 | compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec"; | 214 | compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec"; |
215 | reg = <3000 800>; | 215 | reg = <3000 400>; |
216 | local-mac-address = [ 00 00 00 00 00 00 ]; | 216 | local-mac-address = [ 00 00 00 00 00 00 ]; |
217 | interrupts = <2 5 0>; | 217 | interrupts = <2 5 0>; |
218 | interrupt-parent = <&mpc5200_pic>; | 218 | interrupt-parent = <&mpc5200_pic>; |
219 | phy-handle = <&phy0>; | ||
220 | }; | ||
221 | |||
222 | mdio@3000 { | ||
223 | #address-cells = <1>; | ||
224 | #size-cells = <0>; | ||
225 | compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio"; | ||
226 | reg = <3000 400>; // fec range, since we need to setup fec interrupts | ||
227 | interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. | ||
228 | interrupt-parent = <&mpc5200_pic>; | ||
229 | |||
230 | phy0: ethernet-phy@0 { | ||
231 | device_type = "ethernet-phy"; | ||
232 | reg = <0>; | ||
233 | }; | ||
219 | }; | 234 | }; |
220 | 235 | ||
221 | i2c@3d40 { | 236 | i2c@3d40 { |
237 | #address-cells = <1>; | ||
238 | #size-cells = <0>; | ||
222 | compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c"; | 239 | compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c"; |
223 | reg = <3d40 40>; | 240 | reg = <3d40 40>; |
224 | interrupts = <2 10 0>; | 241 | interrupts = <2 10 0>; |
@@ -231,4 +248,22 @@ | |||
231 | reg = <8000 4000>; | 248 | reg = <8000 4000>; |
232 | }; | 249 | }; |
233 | }; | 250 | }; |
251 | |||
252 | lpb { | ||
253 | model = "fsl,lpb"; | ||
254 | compatible = "fsl,lpb"; | ||
255 | #address-cells = <2>; | ||
256 | #size-cells = <1>; | ||
257 | ranges = <0 0 fc000000 2000000>; | ||
258 | |||
259 | // 16-bit flash device at LocalPlus Bus CS0 | ||
260 | flash@0,0 { | ||
261 | compatible = "cfi-flash"; | ||
262 | reg = <0 0 2000000>; | ||
263 | bank-width = <2>; | ||
264 | device-width = <2>; | ||
265 | #size-cells = <1>; | ||
266 | #address-cells = <1>; | ||
267 | }; | ||
268 | }; | ||
234 | }; | 269 | }; |
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts index 0d701c1bf539..09b4e16154d6 100644 --- a/arch/powerpc/boot/dts/lite5200.dts +++ b/arch/powerpc/boot/dts/lite5200.dts | |||
@@ -258,6 +258,21 @@ | |||
258 | local-mac-address = [ 00 00 00 00 00 00 ]; | 258 | local-mac-address = [ 00 00 00 00 00 00 ]; |
259 | interrupts = <2 5 0>; | 259 | interrupts = <2 5 0>; |
260 | interrupt-parent = <&mpc5200_pic>; | 260 | interrupt-parent = <&mpc5200_pic>; |
261 | phy-handle = <&phy0>; | ||
262 | }; | ||
263 | |||
264 | mdio@3000 { | ||
265 | #address-cells = <1>; | ||
266 | #size-cells = <0>; | ||
267 | compatible = "fsl,mpc5200-mdio"; | ||
268 | reg = <3000 400>; // fec range, since we need to setup fec interrupts | ||
269 | interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. | ||
270 | interrupt-parent = <&mpc5200_pic>; | ||
271 | |||
272 | phy0:ethernet-phy@1 { | ||
273 | device_type = "ethernet-phy"; | ||
274 | reg = <1>; | ||
275 | }; | ||
261 | }; | 276 | }; |
262 | 277 | ||
263 | ata@3a00 { | 278 | ata@3a00 { |
diff --git a/arch/powerpc/boot/dts/motionpro.dts b/arch/powerpc/boot/dts/motionpro.dts index 76951ab038ee..2b0dde058f8e 100644 --- a/arch/powerpc/boot/dts/motionpro.dts +++ b/arch/powerpc/boot/dts/motionpro.dts | |||
@@ -148,7 +148,6 @@ | |||
148 | interrupt-parent = <&mpc5200_pic>; | 148 | interrupt-parent = <&mpc5200_pic>; |
149 | }; | 149 | }; |
150 | 150 | ||
151 | |||
152 | spi@f00 { | 151 | spi@f00 { |
153 | compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi"; | 152 | compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi"; |
154 | reg = <f00 20>; | 153 | reg = <f00 20>; |
@@ -209,10 +208,25 @@ | |||
209 | ethernet@3000 { | 208 | ethernet@3000 { |
210 | device_type = "network"; | 209 | device_type = "network"; |
211 | compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec"; | 210 | compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec"; |
212 | reg = <3000 800>; | 211 | reg = <3000 400>; |
213 | local-mac-address = [ 00 00 00 00 00 00 ]; | 212 | local-mac-address = [ 00 00 00 00 00 00 ]; |
214 | interrupts = <2 5 0>; | 213 | interrupts = <2 5 0>; |
215 | interrupt-parent = <&mpc5200_pic>; | 214 | interrupt-parent = <&mpc5200_pic>; |
215 | phy-handle = <&phy0>; | ||
216 | }; | ||
217 | |||
218 | mdio@3000 { | ||
219 | #address-cells = <1>; | ||
220 | #size-cells = <0>; | ||
221 | compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio"; | ||
222 | reg = <3000 400>; // fec range, since we need to setup fec interrupts | ||
223 | interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. | ||
224 | interrupt-parent = <&mpc5200_pic>; | ||
225 | |||
226 | phy0: ethernet-phy@2 { | ||
227 | device_type = "ethernet-phy"; | ||
228 | reg = <2>; | ||
229 | }; | ||
216 | }; | 230 | }; |
217 | 231 | ||
218 | ata@3a00 { | 232 | ata@3a00 { |
@@ -223,11 +237,19 @@ | |||
223 | }; | 237 | }; |
224 | 238 | ||
225 | i2c@3d40 { | 239 | i2c@3d40 { |
240 | #address-cells = <1>; | ||
241 | #size-cells = <0>; | ||
226 | compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c"; | 242 | compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c"; |
227 | reg = <3d40 40>; | 243 | reg = <3d40 40>; |
228 | interrupts = <2 10 0>; | 244 | interrupts = <2 10 0>; |
229 | interrupt-parent = <&mpc5200_pic>; | 245 | interrupt-parent = <&mpc5200_pic>; |
230 | fsl5200-clocking; | 246 | fsl5200-clocking; |
247 | |||
248 | rtc@68 { | ||
249 | device_type = "rtc"; | ||
250 | compatible = "dallas,ds1339"; | ||
251 | reg = <68>; | ||
252 | }; | ||
231 | }; | 253 | }; |
232 | 254 | ||
233 | sram@8000 { | 255 | sram@8000 { |
@@ -240,7 +262,8 @@ | |||
240 | compatible = "fsl,lpb"; | 262 | compatible = "fsl,lpb"; |
241 | #address-cells = <2>; | 263 | #address-cells = <2>; |
242 | #size-cells = <1>; | 264 | #size-cells = <1>; |
243 | ranges = <1 0 50000000 00010000 | 265 | ranges = <0 0 ff000000 01000000 |
266 | 1 0 50000000 00010000 | ||
244 | 2 0 50010000 00010000 | 267 | 2 0 50010000 00010000 |
245 | 3 0 50020000 00010000>; | 268 | 3 0 50020000 00010000>; |
246 | 269 | ||
@@ -271,31 +294,15 @@ | |||
271 | compatible = "promess,pro_module_dio"; | 294 | compatible = "promess,pro_module_dio"; |
272 | reg = <3 800 2>; | 295 | reg = <3 800 2>; |
273 | }; | 296 | }; |
274 | }; | ||
275 | 297 | ||
276 | pci@f0000d00 { | 298 | // 16-bit flash device at LocalPlus Bus CS0 |
277 | #interrupt-cells = <1>; | 299 | flash@0,0 { |
278 | #size-cells = <2>; | 300 | compatible = "cfi-flash"; |
279 | #address-cells = <3>; | 301 | reg = <0 0 01000000>; |
280 | device_type = "pci"; | 302 | bank-width = <2>; |
281 | compatible = "fsl,mpc5200b-pci","fsl,mpc5200-pci"; | 303 | device-width = <2>; |
282 | reg = <f0000d00 100>; | 304 | #size-cells = <1>; |
283 | interrupt-map-mask = <f800 0 0 7>; | 305 | #address-cells = <1>; |
284 | interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot | 306 | }; |
285 | c000 0 0 2 &mpc5200_pic 1 1 3 | ||
286 | c000 0 0 3 &mpc5200_pic 1 2 3 | ||
287 | c000 0 0 4 &mpc5200_pic 1 3 3 | ||
288 | |||
289 | c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot | ||
290 | c800 0 0 2 &mpc5200_pic 1 2 3 | ||
291 | c800 0 0 3 &mpc5200_pic 1 3 3 | ||
292 | c800 0 0 4 &mpc5200_pic 0 0 3>; | ||
293 | clock-frequency = <0>; // From boot loader | ||
294 | interrupts = <2 8 0 2 9 0 2 a 0>; | ||
295 | interrupt-parent = <&mpc5200_pic>; | ||
296 | bus-range = <0 0>; | ||
297 | ranges = <42000000 0 80000000 80000000 0 20000000 | ||
298 | 02000000 0 a0000000 a0000000 0 10000000 | ||
299 | 01000000 0 00000000 b0000000 0 01000000>; | ||
300 | }; | 307 | }; |
301 | }; | 308 | }; |
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index 49c05e97386c..eac8e1b59496 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts | |||
@@ -255,14 +255,14 @@ | |||
255 | }; | 255 | }; |
256 | 256 | ||
257 | sata@18000 { | 257 | sata@18000 { |
258 | compatible = "fsl,mpc8379-sata"; | 258 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
259 | reg = <0x18000 0x1000>; | 259 | reg = <0x18000 0x1000>; |
260 | interrupts = <44 0x8>; | 260 | interrupts = <44 0x8>; |
261 | interrupt-parent = <&ipic>; | 261 | interrupt-parent = <&ipic>; |
262 | }; | 262 | }; |
263 | 263 | ||
264 | sata@19000 { | 264 | sata@19000 { |
265 | compatible = "fsl,mpc8379-sata"; | 265 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
266 | reg = <0x19000 0x1000>; | 266 | reg = <0x19000 0x1000>; |
267 | interrupts = <45 0x8>; | 267 | interrupts = <45 0x8>; |
268 | interrupt-parent = <&ipic>; | 268 | interrupt-parent = <&ipic>; |
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 440aa4dfab0c..5bc09ad016f5 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts | |||
@@ -143,7 +143,6 @@ | |||
143 | mode = "cpu"; | 143 | mode = "cpu"; |
144 | }; | 144 | }; |
145 | 145 | ||
146 | /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ | ||
147 | usb@23000 { | 146 | usb@23000 { |
148 | compatible = "fsl-usb2-dr"; | 147 | compatible = "fsl-usb2-dr"; |
149 | reg = <0x23000 0x1000>; | 148 | reg = <0x23000 0x1000>; |
@@ -151,7 +150,7 @@ | |||
151 | #size-cells = <0>; | 150 | #size-cells = <0>; |
152 | interrupt-parent = <&ipic>; | 151 | interrupt-parent = <&ipic>; |
153 | interrupts = <38 0x8>; | 152 | interrupts = <38 0x8>; |
154 | phy_type = "utmi"; | 153 | phy_type = "ulpi"; |
155 | }; | 154 | }; |
156 | 155 | ||
157 | mdio@24520 { | 156 | mdio@24520 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 92711534b179..711f9a30f9ab 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
@@ -143,7 +143,6 @@ | |||
143 | mode = "cpu"; | 143 | mode = "cpu"; |
144 | }; | 144 | }; |
145 | 145 | ||
146 | /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ | ||
147 | usb@23000 { | 146 | usb@23000 { |
148 | compatible = "fsl-usb2-dr"; | 147 | compatible = "fsl-usb2-dr"; |
149 | reg = <0x23000 0x1000>; | 148 | reg = <0x23000 0x1000>; |
@@ -151,7 +150,7 @@ | |||
151 | #size-cells = <0>; | 150 | #size-cells = <0>; |
152 | interrupt-parent = <&ipic>; | 151 | interrupt-parent = <&ipic>; |
153 | interrupts = <38 0x8>; | 152 | interrupts = <38 0x8>; |
154 | phy_type = "utmi"; | 153 | phy_type = "ulpi"; |
155 | }; | 154 | }; |
156 | 155 | ||
157 | mdio@24520 { | 156 | mdio@24520 { |
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts index fdb4a9255b24..6f78a9fd9826 100644 --- a/arch/powerpc/boot/dts/mpc8379_mds.dts +++ b/arch/powerpc/boot/dts/mpc8379_mds.dts | |||
@@ -255,28 +255,28 @@ | |||
255 | }; | 255 | }; |
256 | 256 | ||
257 | sata@18000 { | 257 | sata@18000 { |
258 | compatible = "fsl,mpc8379-sata"; | 258 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
259 | reg = <0x18000 0x1000>; | 259 | reg = <0x18000 0x1000>; |
260 | interrupts = <44 0x8>; | 260 | interrupts = <44 0x8>; |
261 | interrupt-parent = <&ipic>; | 261 | interrupt-parent = <&ipic>; |
262 | }; | 262 | }; |
263 | 263 | ||
264 | sata@19000 { | 264 | sata@19000 { |
265 | compatible = "fsl,mpc8379-sata"; | 265 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
266 | reg = <0x19000 0x1000>; | 266 | reg = <0x19000 0x1000>; |
267 | interrupts = <45 0x8>; | 267 | interrupts = <45 0x8>; |
268 | interrupt-parent = <&ipic>; | 268 | interrupt-parent = <&ipic>; |
269 | }; | 269 | }; |
270 | 270 | ||
271 | sata@1a000 { | 271 | sata@1a000 { |
272 | compatible = "fsl,mpc8379-sata"; | 272 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
273 | reg = <0x1a000 0x1000>; | 273 | reg = <0x1a000 0x1000>; |
274 | interrupts = <46 0x8>; | 274 | interrupts = <46 0x8>; |
275 | interrupt-parent = <&ipic>; | 275 | interrupt-parent = <&ipic>; |
276 | }; | 276 | }; |
277 | 277 | ||
278 | sata@1b000 { | 278 | sata@1b000 { |
279 | compatible = "fsl,mpc8379-sata"; | 279 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
280 | reg = <0x1b000 0x1000>; | 280 | reg = <0x1b000 0x1000>; |
281 | interrupts = <47 0x8>; | 281 | interrupts = <47 0x8>; |
282 | interrupt-parent = <&ipic>; | 282 | interrupt-parent = <&ipic>; |
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index 0dda2fc558f8..c11ceb7d3299 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
@@ -143,7 +143,6 @@ | |||
143 | mode = "cpu"; | 143 | mode = "cpu"; |
144 | }; | 144 | }; |
145 | 145 | ||
146 | /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ | ||
147 | usb@23000 { | 146 | usb@23000 { |
148 | compatible = "fsl-usb2-dr"; | 147 | compatible = "fsl-usb2-dr"; |
149 | reg = <0x23000 0x1000>; | 148 | reg = <0x23000 0x1000>; |
@@ -151,7 +150,7 @@ | |||
151 | #size-cells = <0>; | 150 | #size-cells = <0>; |
152 | interrupt-parent = <&ipic>; | 151 | interrupt-parent = <&ipic>; |
153 | interrupts = <38 0x8>; | 152 | interrupts = <38 0x8>; |
154 | phy_type = "utmi"; | 153 | phy_type = "ulpi"; |
155 | }; | 154 | }; |
156 | 155 | ||
157 | mdio@24520 { | 156 | mdio@24520 { |
diff --git a/arch/powerpc/boot/dts/tqm5200.dts b/arch/powerpc/boot/dts/tqm5200.dts index c86464f007da..65bcea6a0173 100644 --- a/arch/powerpc/boot/dts/tqm5200.dts +++ b/arch/powerpc/boot/dts/tqm5200.dts | |||
@@ -127,10 +127,25 @@ | |||
127 | ethernet@3000 { | 127 | ethernet@3000 { |
128 | device_type = "network"; | 128 | device_type = "network"; |
129 | compatible = "fsl,mpc5200-fec"; | 129 | compatible = "fsl,mpc5200-fec"; |
130 | reg = <3000 800>; | 130 | reg = <3000 400>; |
131 | local-mac-address = [ 00 00 00 00 00 00 ]; | 131 | local-mac-address = [ 00 00 00 00 00 00 ]; |
132 | interrupts = <2 5 0>; | 132 | interrupts = <2 5 0>; |
133 | interrupt-parent = <&mpc5200_pic>; | 133 | interrupt-parent = <&mpc5200_pic>; |
134 | phy-handle = <&phy0>; | ||
135 | }; | ||
136 | |||
137 | mdio@3000 { | ||
138 | #address-cells = <1>; | ||
139 | #size-cells = <0>; | ||
140 | compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio"; | ||
141 | reg = <3000 400>; // fec range, since we need to setup fec interrupts | ||
142 | interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. | ||
143 | interrupt-parent = <&mpc5200_pic>; | ||
144 | |||
145 | phy0: ethernet-phy@0 { | ||
146 | device_type = "ethernet-phy"; | ||
147 | reg = <0>; | ||
148 | }; | ||
134 | }; | 149 | }; |
135 | 150 | ||
136 | ata@3a00 { | 151 | ata@3a00 { |
@@ -141,11 +156,19 @@ | |||
141 | }; | 156 | }; |
142 | 157 | ||
143 | i2c@3d40 { | 158 | i2c@3d40 { |
159 | #address-cells = <1>; | ||
160 | #size-cells = <0>; | ||
144 | compatible = "fsl,mpc5200-i2c","fsl-i2c"; | 161 | compatible = "fsl,mpc5200-i2c","fsl-i2c"; |
145 | reg = <3d40 40>; | 162 | reg = <3d40 40>; |
146 | interrupts = <2 10 0>; | 163 | interrupts = <2 10 0>; |
147 | interrupt-parent = <&mpc5200_pic>; | 164 | interrupt-parent = <&mpc5200_pic>; |
148 | fsl5200-clocking; | 165 | fsl5200-clocking; |
166 | |||
167 | rtc@68 { | ||
168 | device_type = "rtc"; | ||
169 | compatible = "dallas,ds1307"; | ||
170 | reg = <68>; | ||
171 | }; | ||
149 | }; | 172 | }; |
150 | 173 | ||
151 | sram@8000 { | 174 | sram@8000 { |
@@ -154,6 +177,23 @@ | |||
154 | }; | 177 | }; |
155 | }; | 178 | }; |
156 | 179 | ||
180 | lpb { | ||
181 | model = "fsl,lpb"; | ||
182 | compatible = "fsl,lpb"; | ||
183 | #address-cells = <2>; | ||
184 | #size-cells = <1>; | ||
185 | ranges = <0 0 fc000000 02000000>; | ||
186 | |||
187 | flash@0,0 { | ||
188 | compatible = "cfi-flash"; | ||
189 | reg = <0 0 02000000>; | ||
190 | bank-width = <4>; | ||
191 | device-width = <2>; | ||
192 | #size-cells = <1>; | ||
193 | #address-cells = <1>; | ||
194 | }; | ||
195 | }; | ||
196 | |||
157 | pci@f0000d00 { | 197 | pci@f0000d00 { |
158 | #interrupt-cells = <1>; | 198 | #interrupt-cells = <1>; |
159 | #size-cells = <2>; | 199 | #size-cells = <2>; |