diff options
| author | Jon Loeliger <jdl@jdl.com> | 2006-08-17 08:42:35 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-18 09:50:16 +1000 |
| commit | f583165f6a926e9f27ff8d15c0e4b22e83f0d599 (patch) | |
| tree | d4765340b1184a4a94565bbad197cb7b2488d6d1 /arch | |
| parent | 9a936a2e0526089194159eae31238e36b1c19e74 (diff) | |
| download | linux-3.10-f583165f6a926e9f27ff8d15c0e4b22e83f0d599.tar.gz linux-3.10-f583165f6a926e9f27ff8d15c0e4b22e83f0d599.tar.bz2 linux-3.10-f583165f6a926e9f27ff8d15c0e4b22e83f0d599.zip | |
[POWERPC] 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 <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index e983972132d..12b65609c07 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c @@ -169,8 +169,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 = |