hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openwrt/target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch

42 lines
1.3 KiB
Diff
Raw Normal View History

register SSB sprom after ethernet devices In case the MAC address pool is not big enough to also register a SSB SPROM prefer registering the Ethernet devices. SVN-Revision: 27258
2011-06-22 12:32:03 +00:00
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
improve BCM6345 support - runtime detect the amount of memory available - define EBI_BASE as MPI_BASE to get rid of chip-select specific hacks - fix GPIO control SVN-Revision: 27880
2011-08-02 18:55:46 +00:00
@@ -861,18 +861,6 @@ void __init board_prom_init(void)
register SSB sprom after ethernet devices In case the MAC address pool is not big enough to also register a SSB SPROM prefer registering the Ethernet devices. SVN-Revision: 27258
2011-06-22 12:32:03 +00:00
}
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
}
/*
improve BCM6345 support - runtime detect the amount of memory available - define EBI_BASE as MPI_BASE to get rid of chip-select specific hacks - fix GPIO control SVN-Revision: 27880
2011-08-02 18:55:46 +00:00
@@ -948,6 +936,19 @@ int __init board_register_devices(void)
register SSB sprom after ethernet devices In case the MAC address pool is not big enough to also register a SSB SPROM prefer registering the Ethernet devices. SVN-Revision: 27258
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();