Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eae98266 authored by Timur Tabi's avatar Timur Tabi Committed by Kumar Gala
Browse files

[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: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 65482ccf

arch/powerpc/boot/dts/mpc832x_mds.dts

+14 −2
Original line number Diff line number Diff line
@@ -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 >;

arch/powerpc/boot/dts/mpc832x_rdb.dts

+14 −2
Original line number Diff line number Diff line
@@ -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>;

arch/powerpc/boot/dts/mpc8349emitx.dts

+10 −0
Original line number Diff line number Diff line
@@ -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>;

arch/powerpc/boot/dts/mpc834x_mds.dts

+10 −0
Original line number Diff line number Diff line
@@ -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>;

arch/powerpc/boot/dts/mpc836x_mds.dts

+14 −2
Original line number Diff line number Diff line
@@ -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 >;