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/mpc836x_mds.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/mpc836x_mds.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc836x_mds.dts | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index 38c8594df3a4..1e914f31dd92 100644 --- a/arch/powerpc/boot/dts/mpc836x_mds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts | |||
@@ -301,7 +301,13 @@ | |||
301 | reg = <2000 200>; | 301 | reg = <2000 200>; |
302 | interrupts = <20>; | 302 | interrupts = <20>; |
303 | interrupt-parent = < &qeic >; | 303 | interrupt-parent = < &qeic >; |
304 | mac-address = [ 00 04 9f 00 23 23 ]; | 304 | /* |
305 | * mac-address is deprecated and will be removed | ||
306 | * in 2.6.25. Only recent versions of | ||
307 | * U-Boot support local-mac-address, however. | ||
308 | */ | ||
309 | mac-address = [ 00 00 00 00 00 00 ]; | ||
310 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
305 | rx-clock = <0>; | 311 | rx-clock = <0>; |
306 | tx-clock = <19>; | 312 | tx-clock = <19>; |
307 | phy-handle = < &phy0 >; | 313 | phy-handle = < &phy0 >; |
@@ -317,7 +323,13 @@ | |||
317 | reg = <3000 200>; | 323 | reg = <3000 200>; |
318 | interrupts = <21>; | 324 | interrupts = <21>; |
319 | interrupt-parent = < &qeic >; | 325 | interrupt-parent = < &qeic >; |
320 | mac-address = [ 00 11 22 33 44 55 ]; | 326 | /* |
327 | * mac-address is deprecated and will be removed | ||
328 | * in 2.6.25. Only recent versions of | ||
329 | * U-Boot support local-mac-address, however. | ||
330 | */ | ||
331 | mac-address = [ 00 00 00 00 00 00 ]; | ||
332 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
321 | rx-clock = <0>; | 333 | rx-clock = <0>; |
322 | tx-clock = <14>; | 334 | tx-clock = <14>; |
323 | phy-handle = < &phy1 >; | 335 | phy-handle = < &phy1 >; |