summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2012-01-24 19:57:27 +0100
committerShawn Guo <shawn.guo@linaro.org>2012-01-31 23:08:52 +0800
commit5a91d7c8a654b2076e9f3b39544cb5e0a6c0aa3b (patch)
tree51d59600956a2cd4df78cbe6628a885eeb7848d7 /arch
parentc5f98794f9d807c1d203468f8deb1b3524a95e67 (diff)
downloadlinux-3.10-5a91d7c8a654b2076e9f3b39544cb5e0a6c0aa3b.tar.gz
linux-3.10-5a91d7c8a654b2076e9f3b39544cb5e0a6c0aa3b.tar.bz2
linux-3.10-5a91d7c8a654b2076e9f3b39544cb5e0a6c0aa3b.zip
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')
-rw-r--r--arch/arm/mach-mxs/mach-m28evk.c2
-rw-r--r--arch/arm/mach-mxs/mach-mx28evk.c2
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 eec1257e7f9..06d79963611 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)
* so hard-code DENX OUI (C0:E5:4E) here.
*/
for (i = 0; i < 2; i++) {
- val = ocotp[i * 4];
+ val = ocotp[i];
mx28_fec_pdata[i].mac[0] = 0xC0;
mx28_fec_pdata[i].mac[1] = 0xE5;
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 81641760867..e386c142f93 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)
* so hard-code Freescale OUI (00:04:9f) here.
*/
for (i = 0; i < 2; i++) {
- val = ocotp[i * 4];
+ val = ocotp[i];
mx28_fec_pdata[i].mac[0] = 0x00;
mx28_fec_pdata[i].mac[1] = 0x04;
mx28_fec_pdata[i].mac[2] = 0x9f;