mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
brcm63xx: add support for linux 3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29731 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -862,18 +862,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
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -949,6 +937,19 @@ int __init board_register_devices(void)
|
||||
!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();
|
||||
|
||||
Reference in New Issue
Block a user