diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/bcm63xx/boards/board_bcm963xx.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 8b0abcb4838e..5addb9c6fb0b 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c | |||
@@ -716,6 +716,17 @@ void __init board_prom_init(void) | |||
716 | } | 716 | } |
717 | 717 | ||
718 | bcm_gpio_writel(val, GPIO_MODE_REG); | 718 | bcm_gpio_writel(val, GPIO_MODE_REG); |
719 | |||
720 | /* Generate MAC address for WLAN and | ||
721 | * register our SPROM */ | ||
722 | #ifdef CONFIG_SSB_PCIHOST | ||
723 | if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { | ||
724 | memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); | ||
725 | memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); | ||
726 | if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0) | ||
727 | printk(KERN_ERR "failed to register fallback SPROM\n"); | ||
728 | } | ||
729 | #endif | ||
719 | } | 730 | } |
720 | 731 | ||
721 | /* | 732 | /* |
@@ -869,17 +880,6 @@ int __init board_register_devices(void) | |||
869 | if (board.has_dsp) | 880 | if (board.has_dsp) |
870 | bcm63xx_dsp_register(&board.dsp); | 881 | bcm63xx_dsp_register(&board.dsp); |
871 | 882 | ||
872 | /* Generate MAC address for WLAN and | ||
873 | * register our SPROM */ | ||
874 | #ifdef CONFIG_SSB_PCIHOST | ||
875 | if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { | ||
876 | memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); | ||
877 | memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); | ||
878 | if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0) | ||
879 | printk(KERN_ERR "failed to register fallback SPROM\n"); | ||
880 | } | ||
881 | #endif | ||
882 | |||
883 | /* read base address of boot chip select (0) */ | 883 | /* read base address of boot chip select (0) */ |
884 | if (BCMCPU_IS_6345()) | 884 | if (BCMCPU_IS_6345()) |
885 | val = 0x1fc00000; | 885 | val = 0x1fc00000; |