diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-03-19 14:01:45 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2009-03-24 09:35:04 -0400 |
commit | 70b3adbba056f5d9081f1ec9b4a629e3c7502072 (patch) | |
tree | ef7a299becef375b9d59f8d2d4a56e036e17b6d9 /arch/powerpc/boot/dts/mpc8378_mds.dts | |
parent | 125a00d74ea57a901fd4cc3d84baf2e825704b68 (diff) |
powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes
Currently it doesn't matter where the mdio nodes are placed, but with
power management support (i.e. when sleep = <> properties will take
effect), mdio nodes placement will become important: mdio controller
is a part of the ethernet block, so the mdio nodes should be placed
correctly. Otherwise we may wrongly assume that MDIO controllers are
available during sleep.
Suggested-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8378_mds.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8378_mds.dts | 80 |
1 files changed, 44 insertions, 36 deletions
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts index 155841d4db29..651ff2f9db2d 100644 --- a/arch/powerpc/boot/dts/mpc8378_mds.dts +++ b/arch/powerpc/boot/dts/mpc8378_mds.dts | |||
@@ -235,48 +235,15 @@ | |||
235 | sleep = <&pmc 0x00c00000>; | 235 | sleep = <&pmc 0x00c00000>; |
236 | }; | 236 | }; |
237 | 237 | ||
238 | mdio@24520 { | ||
239 | #address-cells = <1>; | ||
240 | #size-cells = <0>; | ||
241 | compatible = "fsl,gianfar-mdio"; | ||
242 | reg = <0x24520 0x20>; | ||
243 | phy2: ethernet-phy@2 { | ||
244 | interrupt-parent = <&ipic>; | ||
245 | interrupts = <17 0x8>; | ||
246 | reg = <0x2>; | ||
247 | device_type = "ethernet-phy"; | ||
248 | }; | ||
249 | phy3: ethernet-phy@3 { | ||
250 | interrupt-parent = <&ipic>; | ||
251 | interrupts = <18 0x8>; | ||
252 | reg = <0x3>; | ||
253 | device_type = "ethernet-phy"; | ||
254 | }; | ||
255 | tbi0: tbi-phy@11 { | ||
256 | reg = <0x11>; | ||
257 | device_type = "tbi-phy"; | ||
258 | }; | ||
259 | }; | ||
260 | |||
261 | mdio@25520 { | ||
262 | #address-cells = <1>; | ||
263 | #size-cells = <0>; | ||
264 | compatible = "fsl,gianfar-tbi"; | ||
265 | reg = <0x25520 0x20>; | ||
266 | |||
267 | tbi1: tbi-phy@11 { | ||
268 | reg = <0x11>; | ||
269 | device_type = "tbi-phy"; | ||
270 | }; | ||
271 | }; | ||
272 | |||
273 | |||
274 | enet0: ethernet@24000 { | 238 | enet0: ethernet@24000 { |
239 | #address-cells = <1>; | ||
240 | #size-cells = <1>; | ||
275 | cell-index = <0>; | 241 | cell-index = <0>; |
276 | device_type = "network"; | 242 | device_type = "network"; |
277 | model = "eTSEC"; | 243 | model = "eTSEC"; |
278 | compatible = "gianfar"; | 244 | compatible = "gianfar"; |
279 | reg = <0x24000 0x1000>; | 245 | reg = <0x24000 0x1000>; |
246 | ranges = <0x0 0x24000 0x1000>; | ||
280 | local-mac-address = [ 00 00 00 00 00 00 ]; | 247 | local-mac-address = [ 00 00 00 00 00 00 ]; |
281 | interrupts = <32 0x8 33 0x8 34 0x8>; | 248 | interrupts = <32 0x8 33 0x8 34 0x8>; |
282 | phy-connection-type = "mii"; | 249 | phy-connection-type = "mii"; |
@@ -285,14 +252,43 @@ | |||
285 | phy-handle = <&phy2>; | 252 | phy-handle = <&phy2>; |
286 | sleep = <&pmc 0xc0000000>; | 253 | sleep = <&pmc 0xc0000000>; |
287 | fsl,magic-packet; | 254 | fsl,magic-packet; |
255 | |||
256 | mdio@520 { | ||
257 | #address-cells = <1>; | ||
258 | #size-cells = <0>; | ||
259 | compatible = "fsl,gianfar-mdio"; | ||
260 | reg = <0x520 0x20>; | ||
261 | |||
262 | phy2: ethernet-phy@2 { | ||
263 | interrupt-parent = <&ipic>; | ||
264 | interrupts = <17 0x8>; | ||
265 | reg = <0x2>; | ||
266 | device_type = "ethernet-phy"; | ||
267 | }; | ||
268 | |||
269 | phy3: ethernet-phy@3 { | ||
270 | interrupt-parent = <&ipic>; | ||
271 | interrupts = <18 0x8>; | ||
272 | reg = <0x3>; | ||
273 | device_type = "ethernet-phy"; | ||
274 | }; | ||
275 | |||
276 | tbi0: tbi-phy@11 { | ||
277 | reg = <0x11>; | ||
278 | device_type = "tbi-phy"; | ||
279 | }; | ||
280 | }; | ||
288 | }; | 281 | }; |
289 | 282 | ||
290 | enet1: ethernet@25000 { | 283 | enet1: ethernet@25000 { |
284 | #address-cells = <1>; | ||
285 | #size-cells = <1>; | ||
291 | cell-index = <1>; | 286 | cell-index = <1>; |
292 | device_type = "network"; | 287 | device_type = "network"; |
293 | model = "eTSEC"; | 288 | model = "eTSEC"; |
294 | compatible = "gianfar"; | 289 | compatible = "gianfar"; |
295 | reg = <0x25000 0x1000>; | 290 | reg = <0x25000 0x1000>; |
291 | ranges = <0x0 0x25000 0x1000>; | ||
296 | local-mac-address = [ 00 00 00 00 00 00 ]; | 292 | local-mac-address = [ 00 00 00 00 00 00 ]; |
297 | interrupts = <35 0x8 36 0x8 37 0x8>; | 293 | interrupts = <35 0x8 36 0x8 37 0x8>; |
298 | phy-connection-type = "mii"; | 294 | phy-connection-type = "mii"; |
@@ -301,6 +297,18 @@ | |||
301 | phy-handle = <&phy3>; | 297 | phy-handle = <&phy3>; |
302 | sleep = <&pmc 0x30000000>; | 298 | sleep = <&pmc 0x30000000>; |
303 | fsl,magic-packet; | 299 | fsl,magic-packet; |
300 | |||
301 | mdio@520 { | ||
302 | #address-cells = <1>; | ||
303 | #size-cells = <0>; | ||
304 | compatible = "fsl,gianfar-tbi"; | ||
305 | reg = <0x520 0x20>; | ||
306 | |||
307 | tbi1: tbi-phy@11 { | ||
308 | reg = <0x11>; | ||
309 | device_type = "tbi-phy"; | ||
310 | }; | ||
311 | }; | ||
304 | }; | 312 | }; |
305 | 313 | ||
306 | serial0: serial@4500 { | 314 | serial0: serial@4500 { |