diff options
Diffstat (limited to 'arch/powerpc')
-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 e983972132d8..12b65609c072 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) | |||
169 | goto err; | 169 | goto err; |
170 | } | 170 | } |
171 | 171 | ||
172 | mac_addr = get_property(np, "address", NULL); | 172 | mac_addr = get_property(np, "local-mac-address", NULL); |
173 | memcpy(gfar_data.mac_addr, mac_addr, 6); | 173 | if (mac_addr == NULL) |
174 | mac_addr = get_property(np, "mac-address", NULL); | ||
175 | if (mac_addr == NULL) { | ||
176 | /* Obsolete */ | ||
177 | mac_addr = get_property(np, "address", NULL); | ||
178 | } | ||
179 | |||
180 | if (mac_addr) | ||
181 | memcpy(gfar_data.mac_addr, mac_addr, 6); | ||
174 | 182 | ||
175 | if (model && !strcasecmp(model, "TSEC")) | 183 | if (model && !strcasecmp(model, "TSEC")) |
176 | gfar_data.device_flags = | 184 | gfar_data.device_flags = |