diff options
| author | Timur Tabi <timur@freescale.com> | 2007-06-22 15:33:15 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-07-03 03:05:41 -0400 |
| commit | eae98266e78e5659d75dbb62b4601960c15c7830 (patch) | |
| tree | dd2aeb31df443b961a477d4cf18c9c4c1b53dc99 /arch/powerpc/boot/dts/mpc8560ads.dts | |
| parent | 65482ccf9d00bf4f68e17eb9c656d045d26e5d1f (diff) | |
[POWERPC] Fix MAC address entries for 83xx, 85xx, and 86xx device trees
For the 83xx, 85xx, and 86xx device trees, add a "local-mac-address" property
to every Ethernet node that didn't have one. Add a comment indicating that
the "address" and/or "mac-address" properties are deprecated in DTS files
and will be removed at a later time. Change all MAC address properties to
have a zero MAC address value.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8560ads.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 80682152b0cf..205ee3219ec6 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
| @@ -101,7 +101,13 @@ | |||
| 101 | model = "TSEC"; | 101 | model = "TSEC"; |
| 102 | compatible = "gianfar"; | 102 | compatible = "gianfar"; |
| 103 | reg = <24000 1000>; | 103 | reg = <24000 1000>; |
| 104 | address = [ 00 00 0C 00 00 FD ]; | 104 | /* |
| 105 | * address is deprecated and will be removed | ||
| 106 | * in 2.6.25. Only recent versions of | ||
| 107 | * U-Boot support local-mac-address, however. | ||
| 108 | */ | ||
| 109 | address = [ 00 00 00 00 00 00 ]; | ||
| 110 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
| 105 | interrupts = <d 2 e 2 12 2>; | 111 | interrupts = <d 2 e 2 12 2>; |
| 106 | interrupt-parent = <&mpic>; | 112 | interrupt-parent = <&mpic>; |
| 107 | phy-handle = <&phy0>; | 113 | phy-handle = <&phy0>; |
| @@ -114,7 +120,13 @@ | |||
| 114 | model = "TSEC"; | 120 | model = "TSEC"; |
| 115 | compatible = "gianfar"; | 121 | compatible = "gianfar"; |
| 116 | reg = <25000 1000>; | 122 | reg = <25000 1000>; |
| 117 | address = [ 00 00 0C 00 01 FD ]; | 123 | /* |
| 124 | * address is deprecated and will be removed | ||
| 125 | * in 2.6.25. Only recent versions of | ||
| 126 | * U-Boot support local-mac-address, however. | ||
| 127 | */ | ||
| 128 | address = [ 00 00 00 00 00 00 ]; | ||
| 129 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
| 118 | interrupts = <13 2 14 2 18 2>; | 130 | interrupts = <13 2 14 2 18 2>; |
| 119 | interrupt-parent = <&mpic>; | 131 | interrupt-parent = <&mpic>; |
| 120 | phy-handle = <&phy1>; | 132 | phy-handle = <&phy1>; |
| @@ -275,7 +287,13 @@ | |||
| 275 | model = "FCC"; | 287 | model = "FCC"; |
| 276 | device-id = <2>; | 288 | device-id = <2>; |
| 277 | reg = <91320 20 88500 100 913a0 30>; | 289 | reg = <91320 20 88500 100 913a0 30>; |
| 278 | mac-address = [ 00 00 0C 00 02 FD ]; | 290 | /* |
| 291 | * mac-address is deprecated and will be removed | ||
| 292 | * in 2.6.25. Only recent versions of | ||
| 293 | * U-Boot support local-mac-address, however. | ||
| 294 | */ | ||
| 295 | mac-address = [ 00 00 00 00 00 00 ]; | ||
| 296 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
| 279 | clock-setup = <ff00ffff 250000>; | 297 | clock-setup = <ff00ffff 250000>; |
| 280 | rx-clock = <15>; | 298 | rx-clock = <15>; |
| 281 | tx-clock = <16>; | 299 | tx-clock = <16>; |
| @@ -290,7 +308,13 @@ | |||
| 290 | model = "FCC"; | 308 | model = "FCC"; |
| 291 | device-id = <3>; | 309 | device-id = <3>; |
| 292 | reg = <91340 20 88600 100 913d0 30>; | 310 | reg = <91340 20 88600 100 913d0 30>; |
| 293 | mac-address = [ 00 00 0C 00 03 FD ]; | 311 | /* |
| 312 | * mac-address is deprecated and will be removed | ||
| 313 | * in 2.6.25. Only recent versions of | ||
| 314 | * U-Boot support local-mac-address, however. | ||
| 315 | */ | ||
| 316 | mac-address = [ 00 00 00 00 00 00 ]; | ||
| 317 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
| 294 | clock-setup = <ffff00ff 3700>; | 318 | clock-setup = <ffff00ff 3700>; |
| 295 | rx-clock = <17>; | 319 | rx-clock = <17>; |
| 296 | tx-clock = <18>; | 320 | tx-clock = <18>; |