diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:49 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:49 +0000 |
| commit | 6b5f483efa9f575c0cfb753de0b32364926b8d4a (patch) | |
| tree | 8ea3946a9418a8923a29fe20387676f1e77bf983 /target/linux/brcm63xx/patches-3.1/260-ssb_sprom_mac_pool.patch | |
| parent | cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4 (diff) | |
| download | upstream-6b5f483efa9f575c0cfb753de0b32364926b8d4a.tar.gz upstream-6b5f483efa9f575c0cfb753de0b32364926b8d4a.tar.bz2 upstream-6b5f483efa9f575c0cfb753de0b32364926b8d4a.zip | |
bcm63xx: add support for linux 3.1-rc1
SVN-Revision: 27941
Diffstat (limited to 'target/linux/brcm63xx/patches-3.1/260-ssb_sprom_mac_pool.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.1/260-ssb_sprom_mac_pool.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.1/260-ssb_sprom_mac_pool.patch b/target/linux/brcm63xx/patches-3.1/260-ssb_sprom_mac_pool.patch new file mode 100644 index 0000000000..6321ed1c63 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.1/260-ssb_sprom_mac_pool.patch @@ -0,0 +1,41 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -861,18 +861,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 + } + + /* +@@ -948,6 +936,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(); + |