]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ARM: mxs: read correct values when setting up MAC
authorWolfram Sang <w.sang@pengutronix.de>
Tue, 24 Jan 2012 18:57:27 +0000 (19:57 +0100)
committerShawn Guo <shawn.guo@linaro.org>
Tue, 31 Jan 2012 15:08:52 +0000 (23:08 +0800)
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>
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-mx28evk.c

index eec1257e7f9798d1e66fea596c56a2ae4acb0099..06d79963611ca0e4c0c174ad5a979280fc78b4e1 100644 (file)
@@ -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;
index 816417608679d539e0c890118e3ac569fa1b21e8..e386c142f93c3f48286b5266e48fd56af788b63b 100644 (file)
@@ -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;