diff options
| author | Timur Tabi | 2007-06-22 21:33:15 +0200 |
|---|---|---|
| committer | Kumar Gala | 2007-07-03 09:05:41 +0200 |
| commit | eae98266e78e5659d75dbb62b4601960c15c7830 (patch) | |
| tree | dd2aeb31df443b961a477d4cf18c9c4c1b53dc99 /arch/powerpc/boot/dts/mpc832x_mds.dts | |
| parent | [POWERPC] qe_lib: export symbols for QE driver to compile as module (diff) | |
| download | kernel-qcow2-linux-eae98266e78e5659d75dbb62b4601960c15c7830.tar.gz kernel-qcow2-linux-eae98266e78e5659d75dbb62b4601960c15c7830.tar.xz kernel-qcow2-linux-eae98266e78e5659d75dbb62b4601960c15c7830.zip | |
[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/mpc832x_mds.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc832x_mds.dts | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts index 112dd5198fe2..4fc0c4d34aa8 100644 --- a/arch/powerpc/boot/dts/mpc832x_mds.dts +++ b/arch/powerpc/boot/dts/mpc832x_mds.dts @@ -272,7 +272,13 @@ reg = <2200 200>; interrupts = <22>; interrupt-parent = < &qeic >; - mac-address = [ 00 04 9f 00 23 23 ]; + /* + * mac-address is deprecated and will be removed + * in 2.6.25. Only recent versions of + * U-Boot support local-mac-address, however. + */ + mac-address = [ 00 00 00 00 00 00 ]; + local-mac-address = [ 00 00 00 00 00 00 ]; rx-clock = <19>; tx-clock = <1a>; phy-handle = < &phy3 >; @@ -287,7 +293,13 @@ reg = <3000 200>; interrupts = <23>; interrupt-parent = < &qeic >; - mac-address = [ 00 11 22 33 44 55 ]; + /* + * mac-address is deprecated and will be removed + * in 2.6.25. Only recent versions of + * U-Boot support local-mac-address, however. + */ + mac-address = [ 00 00 00 00 00 00 ]; + local-mac-address = [ 00 00 00 00 00 00 ]; rx-clock = <17>; tx-clock = <18>; phy-handle = < &phy4 >; |