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

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 112dd5198fe2d4d4406fb5e29cf6b665eda6b1d1..4fc0c4d34aa83361a9375b2334b8e891e8952b53 100644 (file)
--- 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 >;

diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index be4c35784e490c8830e85a8900a831e5b121f7fc..447c03ffabbc2b6422abeca4c33d6c2b4bacefef 100644 (file)
--- 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>;

diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index db0d003032759d5f4df388377dc1d57bf682f45f..ae9bca575453eb4c672011533554750b2704dedf 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -131,6 +131,11 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
                        address = [ 00 00 00 00 00 00 ];
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <20 8 21 8 22 8>;
@@ -145,6 +150,11 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
                        address = [ 00 00 00 00 00 00 ];
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <23 8 24 8 25 8>;

diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index df773fafe9d179f886e68628fee8c826614e3887..310e877826b4edf8024dc9552e7fe5b73812d5f2 100644 (file)
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -136,6 +136,11 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
                        address = [ 00 00 00 00 00 00 ];
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <20 8 21 8 22 8>;
@@ -150,6 +155,11 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
                        address = [ 00 00 00 00 00 00 ];
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <23 8 24 8 25 8>;

diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 38c8594df3a4fd372e5d20e89792859e766f7a44..1e914f31dd92c918e453bf926aa1fc7dc2002665 100644 (file)
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -301,7 +301,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 = < &phy0 >;
@@ -317,7 +323,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 = < &phy1 >;

diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index d91e81c009f51863b23927850311783ed438775b..78828b239d0e43704c6f38afd938e68279213cbd 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -106,8 +106,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                       address = [ 00 E0 0C 00 73 00 ];
-                       local-mac-address = [ 00 E0 0C 00 73 00 ];
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       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 = <&phy0>;
@@ -120,8 +125,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                       address = [ 00 E0 0C 00 73 01 ];
-                       local-mac-address = [ 00 E0 0C 00 73 01 ];
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       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 = <&phy1>;
@@ -134,8 +144,13 @@
                        model = "FEC";
                        compatible = "gianfar";
                        reg = <26000 1000>;
-                       address = [ 00 E0 0C 00 73 02 ];
-                       local-mac-address = [ 00 E0 0C 00 73 02 ];
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       address = [ 00 00 00 00 00 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <19 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;

diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index 4f2c3af2e052c957dd94bd0365909b8aa663cdc6..2a0afbcebe37a8e96d33a28119b1ca40801d35b2 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -100,7 +100,7 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <d 2 e 2 12 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
@@ -113,7 +113,7 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 01 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <13 2 14 2 18 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;

diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index 0550a3c391aa5cb320db13cc2288636623ec10e2..ea9b12662630d2458baf878c01e7e39e3ccabdb9 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -112,7 +112,7 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <d 2 e 2 12 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
@@ -125,7 +125,7 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 01 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <13 2 14 2 18 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
@@ -139,7 +139,7 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <26000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 02 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <f 2 10 2 11 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy2>;
@@ -152,7 +152,7 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <27000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 03 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <15 2 16 2 17 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;

diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index 951ed92f1154d6c9fd5940b8924846370a6d2c78..c41ee616603e1dce9971f586435e2dd391af310f 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -100,7 +100,7 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <0d 2 0e 2 12 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
@@ -113,7 +113,7 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 01 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <13 2 14 2 18 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;

diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 80682152b0cf2314acbff0d8d9a51282a0fd7daa..205ee3219ec60dc94a2e417a7331be8feb4b037d 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -101,7 +101,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                       address = [ 00 00 0C 00 00 FD ];
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       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 = <&phy0>;
@@ -114,7 +120,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                       address = [ 00 00 0C 00 01 FD ];
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       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 = <&phy1>;
@@ -275,7 +287,13 @@
                                model = "FCC";
                                device-id = <2>;
                                reg = <91320 20 88500 100 913a0 30>;
-                               mac-address = [ 00 00 0C 00 02 FD ];
+                               /*
+                                * 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 ];
                                clock-setup = <ff00ffff 250000>;
                                rx-clock = <15>;
                                tx-clock = <16>;
@@ -290,7 +308,13 @@
                                model = "FCC";
                                device-id = <3>;
                                reg = <91340 20 88600 100 913d0 30>;
-                               mac-address = [ 00 00 0C 00 03 FD ];
+                               /*
+                                * 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 ];
                                clock-setup = <ffff00ff 3700>;
                                rx-clock = <17>;
                                tx-clock = <18>;

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index a123ec9456bc0bf4425b11142eb4dbe870b6c5e5..479a7a55ede2eed18cbe1a01daac0a6a0c53e7d5 100644 (file)
--- 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>;

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 393cfdf92ff5401d39f2e742f49e4c8baec0f82f..4b8ac7231ac913726106f21e87cdd51786ac001a 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -121,7 +121,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                       mac-address = [ 00 E0 0C 00 73 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 = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
@@ -134,7 +140,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                       mac-address = [ 00 E0 0C 00 73 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 ];
                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
@@ -147,7 +159,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <26000 1000>;
-                       mac-address = [ 00 E0 0C 00 02 FD ];
+                       /*
+                        * 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 = <1F 2 20 2 21 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy2>;
@@ -160,7 +178,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <27000 1000>;
-                       mac-address = [ 00 E0 0C 00 03 FD ];
+                       /*
+                        * 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 = <25 2 26 2 27 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;