diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-06-22 12:32:03 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-06-22 12:32:03 +0000 |
| commit | d72a90ee7b0f3e81b798b61a87f1ad16cea09bc2 (patch) | |
| tree | 532fbdfd4ec80d6ea49c41b9a9f777dfb9ebb0a6 /target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch | |
| parent | 2bc81b5e4a4768b8c596a61ed110747f7c519f5a (diff) | |
| download | master-187ad058-d72a90ee7b0f3e81b798b61a87f1ad16cea09bc2.tar.gz master-187ad058-d72a90ee7b0f3e81b798b61a87f1ad16cea09bc2.tar.bz2 master-187ad058-d72a90ee7b0f3e81b798b61a87f1ad16cea09bc2.zip | |
[brcm63xx] 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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27258 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch b/target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch new file mode 100644 index 0000000000..2b4e3e0c5f --- /dev/null +++ b/target/linux/brcm63xx/patches-3.0/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 +@@ -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 + } + + /* +@@ -958,6 +946,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(); + |