use radio0 only on the 5312

[openwrt/svn-archive/archive.git] / target / linux / atheros-2.6 / files / arch / mips / atheros / ar5312.c

diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c b/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c
index d337098d5cd68ab2b3594bc1d628900a8ef912fb..8404b882c2c3b02a8d2a5b622dc719c19f6c9808 100644 (file)
--- a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c
+++ b/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c
@@ -255,8 +255,9 @@ int __init ar5312_init_devices(void)
        ar5312_eth1_data.board_config = board_config;
        ar5312_devs[dev++] = &ar5312_physmap_flash;
 
-       ar5312_eth0_data.macaddr = bcfg->enet0Mac;
-       ar5312_eth1_data.macaddr = bcfg->enet1Mac;
+       if (!memcmp(bcfg->enet0Mac, "\xff\xff\xff\xff\xff\xff", 6))
+               memcpy(bcfg->enet0Mac, bcfg->enet1Mac, 6);
+
        if (memcmp(bcfg->enet0Mac, bcfg->enet1Mac, 6) == 0) {
                /* ENET0 and ENET1 have the same mac.
                 * Increment the one from ENET1 */
@@ -267,20 +268,25 @@ int __init ar5312_init_devices(void)
 
        switch(mips_machtype) {
                case MACH_ATHEROS_AR5312:
+                       ar5312_eth0_data.macaddr = bcfg->enet0Mac;
+                       ar5312_eth1_data.macaddr = bcfg->enet1Mac;
                        ar5312_devs[dev++] = &ar5312_eth[0];
                        ar5312_devs[dev++] = &ar5312_eth[1];
                        break;
                case MACH_ATHEROS_AR2312:
                case MACH_ATHEROS_AR2313:
+                       ar231x_eth0_data.macaddr = bcfg->enet0Mac;
                        ar5312_devs[dev++] = &ar231x_eth0;
                        ar5312_flash_data.width = 1;
                        break;
        }
 
        if (radio) {
-               if (*((u32 *) radio) & AR531X_RADIO0_MASK) {
-                       ar5312_wmac[0].dev.platform_data = init_wmac(0);
-                       ar5312_devs[dev++] = &ar5312_wmac[0];
+               if (mips_machtype == MACH_ATHEROS_AR5312) {
+                       if (*((u32 *) radio) & AR531X_RADIO0_MASK) {
+                               ar5312_wmac[0].dev.platform_data = init_wmac(0);
+                               ar5312_devs[dev++] = &ar5312_wmac[0];
+                       }
                }
                if (*((u32 *) radio) & AR531X_RADIO1_MASK) {
                        ar5312_wmac[1].dev.platform_data = init_wmac(1);