2011-06-22 12:32:03 +00:00
|
|
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
|
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
|
|
|
@@ -867,18 +867,6 @@ void __init board_prom_init(void)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bcm_gpio_writel(val, GPIO_MODE_REG);
|
|
|
|
|
-
|
|
|
|
|
- /* Generate MAC address for WLAN and
|
|
|
|
|
- * register our SPROM */
|
|
|
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
|
|
|
- if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
|
|
|
|
|
- memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
|
|
|
|
- memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
|
|
|
|
- if (ssb_arch_register_fallback_sprom(
|
|
|
|
|
- &bcm63xx_get_fallback_sprom) < 0)
|
|
|
|
|
- printk(KERN_ERR PFX "failed to register fallback SPROM\n");
|
|
|
|
|
- }
|
|
|
|
|
-#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
2011-06-25 19:26:17 +00:00
|
|
|
@@ -954,6 +942,19 @@ int __init board_register_devices(void)
|
2011-06-22 12:32:03 +00:00
|
|
|
!board_get_mac_address(board.enet1.mac_addr))
|
|
|
|
|
bcm63xx_enet_register(1, &board.enet1);
|
|
|
|
|
|
|
|
|
|
+ /* Generate MAC address for WLAN and
|
|
|
|
|
+ * register our SPROM, do this after registering enet devices
|
|
|
|
|
+ */
|
|
|
|
|
+#ifdef CONFIG_SSB_PCIHOST
|
|
|
|
|
+ if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
|
|
|
|
|
+ memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
|
|
|
|
+ memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
|
|
|
|
+ if (ssb_arch_register_fallback_sprom(
|
|
|
|
|
+ &bcm63xx_get_fallback_sprom) < 0)
|
|
|
|
|
+ printk(KERN_ERR PFX "failed to register fallback SPROM\n");
|
|
|
|
|
+ }
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
if (board.has_ehci0)
|
|
|
|
|
bcm63xx_ehci_register();
|
|
|
|
|
|
