diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2012-01-24 13:57:27 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-01-31 10:08:52 -0500 |
commit | 5a91d7c8a654b2076e9f3b39544cb5e0a6c0aa3b (patch) | |
tree | 51d59600956a2cd4df78cbe6628a885eeb7848d7 /arch/arm/mach-mxs | |
parent | c5f98794f9d807c1d203468f8deb1b3524a95e67 (diff) |
ARM: mxs: read correct values when setting up MAC
Currently, the MAC address from the second ethernet is generated from the
crypto-key (and not a customer reg) because of a wrong index to the ocotp
array.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r-- | arch/arm/mach-mxs/mach-m28evk.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mxs/mach-mx28evk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/mach-m28evk.c b/arch/arm/mach-mxs/mach-m28evk.c index eec1257e7f97..06d79963611c 100644 --- a/arch/arm/mach-mxs/mach-m28evk.c +++ b/arch/arm/mach-mxs/mach-m28evk.c | |||
@@ -255,7 +255,7 @@ static int __init m28evk_fec_get_mac(void) | |||
255 | * so hard-code DENX OUI (C0:E5:4E) here. | 255 | * so hard-code DENX OUI (C0:E5:4E) here. |
256 | */ | 256 | */ |
257 | for (i = 0; i < 2; i++) { | 257 | for (i = 0; i < 2; i++) { |
258 | val = ocotp[i * 4]; | 258 | val = ocotp[i]; |
259 | mx28_fec_pdata[i].mac[0] = 0xC0; | 259 | mx28_fec_pdata[i].mac[0] = 0xC0; |
260 | mx28_fec_pdata[i].mac[1] = 0xE5; | 260 | mx28_fec_pdata[i].mac[1] = 0xE5; |
261 | mx28_fec_pdata[i].mac[2] = 0x4E; | 261 | mx28_fec_pdata[i].mac[2] = 0x4E; |
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c index 816417608679..e386c142f93c 100644 --- a/arch/arm/mach-mxs/mach-mx28evk.c +++ b/arch/arm/mach-mxs/mach-mx28evk.c | |||
@@ -259,7 +259,7 @@ static int __init mx28evk_fec_get_mac(void) | |||
259 | * so hard-code Freescale OUI (00:04:9f) here. | 259 | * so hard-code Freescale OUI (00:04:9f) here. |
260 | */ | 260 | */ |
261 | for (i = 0; i < 2; i++) { | 261 | for (i = 0; i < 2; i++) { |
262 | val = ocotp[i * 4]; | 262 | val = ocotp[i]; |
263 | mx28_fec_pdata[i].mac[0] = 0x00; | 263 | mx28_fec_pdata[i].mac[0] = 0x00; |
264 | mx28_fec_pdata[i].mac[1] = 0x04; | 264 | mx28_fec_pdata[i].mac[1] = 0x04; |
265 | mx28_fec_pdata[i].mac[2] = 0x9f; | 265 | mx28_fec_pdata[i].mac[2] = 0x9f; |