Convert to mac-address for ethernet MAC address data.
Subsystems (2)
PATCH RESEND 1/1 Convert to mac-address for ethernet MAC address data.
Also accept "local-mac-address". However the old "address" is now obsolete, but accepted for backwards compatibility. It should be removed after all device trees have been converted to use "mac-address".
Signed-off-by Jon Loeliger <[email protected]>
---
This is a resend of
Submitter Jon Loeliger
Date 2006-08-04 07:25:38
Message ID <[email protected]>Also found here:
http://ozlabs.org/pipermail/linuxppc-dev/2006-August/024851.html http://patchwork.ozlabs.org/linuxppc/patch?id=6444
And ACK'ed by Kumar here:
http://ozlabs.org/pipermail/linuxppc-dev/2006-August/025169.html
Documentation/powerpc/booting-without-of.txt | 10 +++++----- arch/powerpc/sysdev/fsl_soc.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 7 deletions(-)
Documentation/powerpc/booting-without-of.txt +5 -5
@@ -1196,7 +1196,7 @@ platforms are moved over to use the flat - model : Model of the device. Can be "TSEC", "eTSEC", or "FEC" - compatible : Should be "gianfar" - reg : Offset and length of the register set for the device - - address : List of bytes representing the ethernet address of + - mac-address : List of bytes representing the ethernet address of this controller - interrupts : <a b> where a is the interrupt number and b is a field that represents an encoding of the sense and level
@@ -1216,7 +1216,7 @@ platforms are moved over to use the flat model = "TSEC"; compatible = "gianfar"; reg = <24000 1000>; - address = [ 00 E0 0C 00 73 00 ]; + mac-address = [ 00 E0 0C 00 73 00 ]; interrupts = <d 3 e 3 12 3>; interrupt-parent = <40000>; phy-handle = <2452000>
@@ -1498,7 +1498,7 @@ not necessary as they are usually the sa model = "TSEC"; compatible = "gianfar"; reg = <24000 1000>; - address = [ 00 E0 0C 00 73 00 ]; + mac-address = [ 00 E0 0C 00 73 00 ]; interrupts = <d 3 e 3 12 3>; interrupt-parent = <40000>; phy-handle = <2452000>;
@@ -1511,7 +1511,7 @@ not necessary as they are usually the sa model = "TSEC"; compatible = "gianfar"; reg = <25000 1000>; - address = [ 00 E0 0C 00 73 01 ]; + mac-address = [ 00 E0 0C 00 73 01 ]; interrupts = <13 3 14 3 18 3>; interrupt-parent = <40000>; phy-handle = <2452001>;
@@ -1524,7 +1524,7 @@ not necessary as they are usually the sa model = "FEC"; compatible = "gianfar"; reg = <26000 1000>; - address = [ 00 E0 0C 00 73 02 ]; + mac-address = [ 00 E0 0C 00 73 02 ]; interrupts = <19 3>; interrupt-parent = <40000>; phy-handle = <2452002>;
arch/powerpc/sysdev/fsl_soc.c +10 -2
@@ -166,8 +166,16 @@ static int __init gfar_of_init(void) goto err; } - mac_addr =get_property (np,"address" ,NULL ); -memcpy (gfar_data.mac_addr, mac_addr,6 ); + mac_addr =get_property (np,"local-mac-address" ,NULL ); +if (mac_addr ==NULL ) + mac_addr =get_property (np,"mac-address" ,NULL ); +if (mac_addr ==NULL ) { +/* Obsolete */ + mac_addr =get_property (np,"address" ,NULL ); + } + +if (mac_addr) +memcpy (gfar_data.mac_addr, mac_addr,6 );if (model && !strcasecmp (model,"TSEC" )) gfar_data.device_flags =
Signature · 1 line
2006_06_07.01.gittree_pull-dirty