[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>

1 files changed, 27 insertions, 3 deletions

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index a123ec9456bc..479a7a55ede2 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -130,7 +130,13 @@
                         model = "eTSEC";
                         compatible = "gianfar";
                         reg = <24000 1000>;
+                        /*
+                         * 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 ];
                         interrupts = <d 2 e 2 12 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy2>;
@@ -143,7 +149,13 @@
                         model = "eTSEC";
                         compatible = "gianfar";
                         reg = <25000 1000>;
-                        mac-address = [ 00 00 00 00 00 00];
+                        /*
+                         * 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 ];
                         interrupts = <13 2 14 2 18 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy3>;
@@ -300,7 +312,13 @@
                         reg = <2000 200>;
                         interrupts = <20>;
                         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 = <0>;
                         tx-clock = <19>;
                         phy-handle = <&qe_phy0>;
@@ -316,7 +334,13 @@
                         reg = <3000 200>;
                         interrupts = <21>;
                         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 = <0>;
                         tx-clock = <14>;
                         phy-handle = <&qe_phy1>;