summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/mpc832x_rdb.dts
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2007-06-22 14:33:15 -0500
committerKumar Gala <galak@kernel.crashing.org>2007-07-03 02:05:41 -0500
commiteae98266e78e5659d75dbb62b4601960c15c7830 (patch)
treedd2aeb31df443b961a477d4cf18c9c4c1b53dc99 /arch/powerpc/boot/dts/mpc832x_rdb.dts
parent65482ccf9d00bf4f68e17eb9c656d045d26e5d1f (diff)
downloadlinux-stable-eae98266e78e5659d75dbb62b4601960c15c7830.tar.gz
linux-stable-eae98266e78e5659d75dbb62b4601960c15c7830.tar.bz2
linux-stable-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_rdb.dts')
-rw-r--r--arch/powerpc/boot/dts/mpc832x_rdb.dts16
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index be4c35784e49..447c03ffabbc 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -231,7 +231,13 @@
reg = <3000 200>;
interrupts = <21>;
interrupt-parent = <&qeic>;
- mac-address = [ 00 04 9f ef 03 02 ];
+ /*
+ * 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 = <20>;
tx-clock = <13>;
phy-handle = <&phy00>;
@@ -246,7 +252,13 @@
reg = <2200 200>;
interrupts = <22>;
interrupt-parent = <&qeic>;
- mac-address = [ 00 04 9f ef 03 01 ];
+ /*
+ * 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 = <&phy04>;