[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>
This commit is contained in:
Timur Tabi 2007-06-22 14:33:15 -05:00 коммит произвёл Kumar Gala
Родитель 65482ccf9d
Коммит eae98266e7
12 изменённых файлов: 174 добавлений и 31 удалений

Просмотреть файл

@ -272,7 +272,13 @@
reg = <2200 200>; reg = <2200 200>;
interrupts = <22>; interrupts = <22>;
interrupt-parent = < &qeic >; 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>; rx-clock = <19>;
tx-clock = <1a>; tx-clock = <1a>;
phy-handle = < &phy3 >; phy-handle = < &phy3 >;
@ -287,7 +293,13 @@
reg = <3000 200>; reg = <3000 200>;
interrupts = <23>; interrupts = <23>;
interrupt-parent = < &qeic >; 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>; rx-clock = <17>;
tx-clock = <18>; tx-clock = <18>;
phy-handle = < &phy4 >; phy-handle = < &phy4 >;

Просмотреть файл

@ -231,7 +231,13 @@
reg = <3000 200>; reg = <3000 200>;
interrupts = <21>; interrupts = <21>;
interrupt-parent = <&qeic>; 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>; rx-clock = <20>;
tx-clock = <13>; tx-clock = <13>;
phy-handle = <&phy00>; phy-handle = <&phy00>;
@ -246,7 +252,13 @@
reg = <2200 200>; reg = <2200 200>;
interrupts = <22>; interrupts = <22>;
interrupt-parent = <&qeic>; 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>; rx-clock = <19>;
tx-clock = <1a>; tx-clock = <1a>;
phy-handle = <&phy04>; phy-handle = <&phy04>;

Просмотреть файл

@ -131,6 +131,11 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <24000 1000>; 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 ]; address = [ 00 00 00 00 00 00 ];
local-mac-address = [ 00 00 00 00 00 00 ]; local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <20 8 21 8 22 8>; interrupts = <20 8 21 8 22 8>;
@ -145,6 +150,11 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <25000 1000>; 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 ]; address = [ 00 00 00 00 00 00 ];
local-mac-address = [ 00 00 00 00 00 00 ]; local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <23 8 24 8 25 8>; interrupts = <23 8 24 8 25 8>;

Просмотреть файл

@ -136,6 +136,11 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <24000 1000>; 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 ]; address = [ 00 00 00 00 00 00 ];
local-mac-address = [ 00 00 00 00 00 00 ]; local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <20 8 21 8 22 8>; interrupts = <20 8 21 8 22 8>;
@ -150,6 +155,11 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <25000 1000>; 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 ]; address = [ 00 00 00 00 00 00 ];
local-mac-address = [ 00 00 00 00 00 00 ]; local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <23 8 24 8 25 8>; interrupts = <23 8 24 8 25 8>;

Просмотреть файл

@ -301,7 +301,13 @@
reg = <2000 200>; reg = <2000 200>;
interrupts = <20>; interrupts = <20>;
interrupt-parent = < &qeic >; 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>; rx-clock = <0>;
tx-clock = <19>; tx-clock = <19>;
phy-handle = < &phy0 >; phy-handle = < &phy0 >;
@ -317,7 +323,13 @@
reg = <3000 200>; reg = <3000 200>;
interrupts = <21>; interrupts = <21>;
interrupt-parent = < &qeic >; 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>; rx-clock = <0>;
tx-clock = <14>; tx-clock = <14>;
phy-handle = < &phy1 >; phy-handle = < &phy1 >;

Просмотреть файл

@ -106,8 +106,13 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <24000 1000>; 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>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
@ -120,8 +125,13 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <25000 1000>; 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>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy1>; phy-handle = <&phy1>;
@ -134,8 +144,13 @@
model = "FEC"; model = "FEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <26000 1000>; 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>; interrupts = <19 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy3>; phy-handle = <&phy3>;

Просмотреть файл

@ -100,7 +100,7 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <24000 1000>; 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>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
@ -113,7 +113,7 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <25000 1000>; 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>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy1>; phy-handle = <&phy1>;

Просмотреть файл

@ -112,7 +112,7 @@
model = "eTSEC"; model = "eTSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <24000 1000>; 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>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
@ -125,7 +125,7 @@
model = "eTSEC"; model = "eTSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <25000 1000>; 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>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy1>; phy-handle = <&phy1>;
@ -139,7 +139,7 @@
model = "eTSEC"; model = "eTSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <26000 1000>; 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>; interrupts = <f 2 10 2 11 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy2>; phy-handle = <&phy2>;
@ -152,7 +152,7 @@
model = "eTSEC"; model = "eTSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <27000 1000>; 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>; interrupts = <15 2 16 2 17 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy3>; phy-handle = <&phy3>;

Просмотреть файл

@ -100,7 +100,7 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <24000 1000>; 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>; interrupts = <0d 2 0e 2 12 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
@ -113,7 +113,7 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <25000 1000>; 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>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy1>; phy-handle = <&phy1>;

Просмотреть файл

@ -101,7 +101,13 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <24000 1000>; 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>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
@ -114,7 +120,13 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <25000 1000>; 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>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy1>; phy-handle = <&phy1>;
@ -275,7 +287,13 @@
model = "FCC"; model = "FCC";
device-id = <2>; device-id = <2>;
reg = <91320 20 88500 100 913a0 30>; 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>; clock-setup = <ff00ffff 250000>;
rx-clock = <15>; rx-clock = <15>;
tx-clock = <16>; tx-clock = <16>;
@ -290,7 +308,13 @@
model = "FCC"; model = "FCC";
device-id = <3>; device-id = <3>;
reg = <91340 20 88600 100 913d0 30>; 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>; clock-setup = <ffff00ff 3700>;
rx-clock = <17>; rx-clock = <17>;
tx-clock = <18>; tx-clock = <18>;

Просмотреть файл

@ -130,7 +130,13 @@
model = "eTSEC"; model = "eTSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <24000 1000>; 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 ]; mac-address = [ 00 00 00 00 00 00 ];
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <d 2 e 2 12 2>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy2>; phy-handle = <&phy2>;
@ -143,7 +149,13 @@
model = "eTSEC"; model = "eTSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <25000 1000>; 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>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy3>; phy-handle = <&phy3>;
@ -300,7 +312,13 @@
reg = <2000 200>; reg = <2000 200>;
interrupts = <20>; interrupts = <20>;
interrupt-parent = <&qeic>; 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>; rx-clock = <0>;
tx-clock = <19>; tx-clock = <19>;
phy-handle = <&qe_phy0>; phy-handle = <&qe_phy0>;
@ -316,7 +334,13 @@
reg = <3000 200>; reg = <3000 200>;
interrupts = <21>; interrupts = <21>;
interrupt-parent = <&qeic>; 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>; rx-clock = <0>;
tx-clock = <14>; tx-clock = <14>;
phy-handle = <&qe_phy1>; phy-handle = <&qe_phy1>;

Просмотреть файл

@ -121,7 +121,13 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <24000 1000>; 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>; interrupts = <1d 2 1e 2 22 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
@ -134,7 +140,13 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <25000 1000>; 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>; interrupts = <23 2 24 2 28 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy1>; phy-handle = <&phy1>;
@ -147,7 +159,13 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <26000 1000>; 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>; interrupts = <1F 2 20 2 21 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy2>; phy-handle = <&phy2>;
@ -160,7 +178,13 @@
model = "TSEC"; model = "TSEC";
compatible = "gianfar"; compatible = "gianfar";
reg = <27000 1000>; 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>; interrupts = <25 2 26 2 27 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
phy-handle = <&phy3>; phy-handle = <&phy3>;