diff options
Diffstat (limited to 'arch/powerpc/boot/dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8377_rdb.dts | 8 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8378_rdb.dts | 8 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8379_rdb.dts | 8 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8548cds.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8610_hpcd.dts | 10 |
5 files changed, 10 insertions, 28 deletions
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 5bc09ad016f5..f3083c779b66 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts | |||
@@ -164,12 +164,6 @@ | |||
164 | reg = <0x2>; | 164 | reg = <0x2>; |
165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
166 | }; | 166 | }; |
167 | phy3: ethernet-phy@3 { | ||
168 | interrupt-parent = <&ipic>; | ||
169 | interrupts = <18 0x8>; | ||
170 | reg = <0x3>; | ||
171 | device_type = "ethernet-phy"; | ||
172 | }; | ||
173 | }; | 167 | }; |
174 | 168 | ||
175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
@@ -195,7 +189,7 @@ | |||
195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
199 | }; | 193 | }; |
200 | 194 | ||
201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 711f9a30f9ab..0e872a60e091 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
@@ -164,12 +164,6 @@ | |||
164 | reg = <0x2>; | 164 | reg = <0x2>; |
165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
166 | }; | 166 | }; |
167 | phy3: ethernet-phy@3 { | ||
168 | interrupt-parent = <&ipic>; | ||
169 | interrupts = <18 0x8>; | ||
170 | reg = <0x3>; | ||
171 | device_type = "ethernet-phy"; | ||
172 | }; | ||
173 | }; | 167 | }; |
174 | 168 | ||
175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
@@ -195,7 +189,7 @@ | |||
195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
199 | }; | 193 | }; |
200 | 194 | ||
201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index c11ceb7d3299..1eb8defaff6f 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
@@ -164,12 +164,6 @@ | |||
164 | reg = <0x2>; | 164 | reg = <0x2>; |
165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
166 | }; | 166 | }; |
167 | phy3: ethernet-phy@3 { | ||
168 | interrupt-parent = <&ipic>; | ||
169 | interrupts = <18 0x8>; | ||
170 | reg = <0x3>; | ||
171 | device_type = "ethernet-phy"; | ||
172 | }; | ||
173 | }; | 167 | }; |
174 | 168 | ||
175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
@@ -195,7 +189,7 @@ | |||
195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
199 | }; | 193 | }; |
200 | 194 | ||
201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index fa298a8c81cc..4811b8107415 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
@@ -409,7 +409,7 @@ | |||
409 | interrupts = <26 2>; | 409 | interrupts = <26 2>; |
410 | bus-range = <0 255>; | 410 | bus-range = <0 255>; |
411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 | 411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 |
412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x8000000>; | 412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>; |
413 | clock-frequency = <33333333>; | 413 | clock-frequency = <33333333>; |
414 | #interrupt-cells = <1>; | 414 | #interrupt-cells = <1>; |
415 | #size-cells = <2>; | 415 | #size-cells = <2>; |
@@ -428,7 +428,7 @@ | |||
428 | 428 | ||
429 | 0x1000000 0x0 0x0 | 429 | 0x1000000 0x0 0x0 |
430 | 0x1000000 0x0 0x0 | 430 | 0x1000000 0x0 0x0 |
431 | 0x0 0x8000000>; | 431 | 0x0 0x100000>; |
432 | }; | 432 | }; |
433 | }; | 433 | }; |
434 | }; | 434 | }; |
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 08a780d89807..fa9b6bbeb5af 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts | |||
@@ -251,14 +251,14 @@ | |||
251 | dma@c300 { | 251 | dma@c300 { |
252 | #address-cells = <1>; | 252 | #address-cells = <1>; |
253 | #size-cells = <1>; | 253 | #size-cells = <1>; |
254 | compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma"; | 254 | compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma"; |
255 | cell-index = <1>; | 255 | cell-index = <1>; |
256 | reg = <0xc300 0x4>; /* DMA general status register */ | 256 | reg = <0xc300 0x4>; /* DMA general status register */ |
257 | ranges = <0x0 0xc100 0x200>; | 257 | ranges = <0x0 0xc100 0x200>; |
258 | 258 | ||
259 | dma-channel@0 { | 259 | dma-channel@0 { |
260 | compatible = "fsl,mpc8610-dma-channel", | 260 | compatible = "fsl,mpc8610-dma-channel", |
261 | "fsl,mpc8540-dma-channel"; | 261 | "fsl,eloplus-dma-channel"; |
262 | cell-index = <0>; | 262 | cell-index = <0>; |
263 | reg = <0x0 0x80>; | 263 | reg = <0x0 0x80>; |
264 | interrupt-parent = <&mpic>; | 264 | interrupt-parent = <&mpic>; |
@@ -266,7 +266,7 @@ | |||
266 | }; | 266 | }; |
267 | dma-channel@1 { | 267 | dma-channel@1 { |
268 | compatible = "fsl,mpc8610-dma-channel", | 268 | compatible = "fsl,mpc8610-dma-channel", |
269 | "fsl,mpc8540-dma-channel"; | 269 | "fsl,eloplus-dma-channel"; |
270 | cell-index = <1>; | 270 | cell-index = <1>; |
271 | reg = <0x80 0x80>; | 271 | reg = <0x80 0x80>; |
272 | interrupt-parent = <&mpic>; | 272 | interrupt-parent = <&mpic>; |
@@ -274,7 +274,7 @@ | |||
274 | }; | 274 | }; |
275 | dma-channel@2 { | 275 | dma-channel@2 { |
276 | compatible = "fsl,mpc8610-dma-channel", | 276 | compatible = "fsl,mpc8610-dma-channel", |
277 | "fsl,mpc8540-dma-channel"; | 277 | "fsl,eloplus-dma-channel"; |
278 | cell-index = <2>; | 278 | cell-index = <2>; |
279 | reg = <0x100 0x80>; | 279 | reg = <0x100 0x80>; |
280 | interrupt-parent = <&mpic>; | 280 | interrupt-parent = <&mpic>; |
@@ -282,7 +282,7 @@ | |||
282 | }; | 282 | }; |
283 | dma-channel@3 { | 283 | dma-channel@3 { |
284 | compatible = "fsl,mpc8610-dma-channel", | 284 | compatible = "fsl,mpc8610-dma-channel", |
285 | "fsl,mpc8540-dma-channel"; | 285 | "fsl,eloplus-dma-channel"; |
286 | cell-index = <3>; | 286 | cell-index = <3>; |
287 | reg = <0x180 0x80>; | 287 | reg = <0x180 0x80>; |
288 | interrupt-parent = <&mpic>; | 288 | interrupt-parent = <&mpic>; |