diff options
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.c')
-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 4a6aa640ac13..92ba378b7990 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
@@ -166,8 +166,16 @@ static int __init gfar_of_init(void) | |||
166 | goto err; | 166 | goto err; |
167 | } | 167 | } |
168 | 168 | ||
169 | mac_addr = get_property(np, "address", NULL); | 169 | mac_addr = get_property(np, "local-mac-address", NULL); |
170 | memcpy(gfar_data.mac_addr, mac_addr, 6); | 170 | if (mac_addr == NULL) |
171 | mac_addr = get_property(np, "mac-address", NULL); | ||
172 | if (mac_addr == NULL) { | ||
173 | /* Obsolete */ | ||
174 | mac_addr = get_property(np, "address", NULL); | ||
175 | } | ||
176 | |||
177 | if (mac_addr) | ||
178 | memcpy(gfar_data.mac_addr, mac_addr, 6); | ||
171 | 179 | ||
172 | if (model && !strcasecmp(model, "TSEC")) | 180 | if (model && !strcasecmp(model, "TSEC")) |
173 | gfar_data.device_flags = | 181 | gfar_data.device_flags = |