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 | f6e4eb15bc7b5991a484370ae3765eb79becea4b (patch) | |
| tree | 8839ac68a6af6f6e8ea4e59190b0bfb2f1795cbc /target/linux/brcm63xx/patches-2.6.39 | |
| parent | cda35d2ef2ba813d93e38c61539a70d3e0727048 (diff) | |
| download | upstream-f6e4eb15bc7b5991a484370ae3765eb79becea4b.tar.gz upstream-f6e4eb15bc7b5991a484370ae3765eb79becea4b.tar.bz2 upstream-f6e4eb15bc7b5991a484370ae3765eb79becea4b.zip | |
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
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.39')
3 files changed, 42 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.39/260-ssb_sprom_mac_pool.patch b/target/linux/brcm63xx/patches-2.6.39/260-ssb_sprom_mac_pool.patch new file mode 100644 index 0000000000..70711ec3ab --- /dev/null +++ b/target/linux/brcm63xx/patches-2.6.39/260-ssb_sprom_mac_pool.patch @@ -0,0 +1,39 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -856,17 +856,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_set_fallback_sprom(&bcm63xx_sprom) < 0) +- printk(KERN_ERR "failed to register fallback SPROM\n"); +- } +-#endif + } + + /* +@@ -946,6 +935,18 @@ 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_set_fallback_sprom(&bcm63xx_sprom) < 0) ++ printk(KERN_ERR "failed to register fallback SPROM\n"); ++ } ++#endif ++ + if (board.has_ehci0) + bcm63xx_ehci_register(); + diff --git a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch index 91cb629d8e..3028865273 100644 --- a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch @@ -95,7 +95,7 @@ /* dump cfe version */ cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; -@@ -2263,6 +2337,14 @@ int __init board_register_devices(void) +@@ -2264,6 +2338,14 @@ int __init board_register_devices(void) val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val &= MPI_CSBASE_BASE_MASK; } diff --git a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch index 349e5f5007..c4dc287c76 100644 --- a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch +++ b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch @@ -18,7 +18,7 @@ #endif /* -@@ -2328,8 +2339,9 @@ void __init board_prom_init(void) +@@ -2407,8 +2418,9 @@ int __init board_register_devices(void) 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); @@ -29,7 +29,7 @@ + printk(KERN_ERR PFX "failed to register fallback SPROM\n"); } #endif - } + --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c @@ -662,7 +662,6 @@ static int sprom_extract(struct ssb_bus |