[mac80211]: add support for the wl18xx, split wlcore from wl12xx

[openwrt.git] / target / linux / bcm53xx / patches-3.10 / 202-bgmac-make-bgmac-work-on-systems-without-nvram.patch

diff --git a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch
index eda49b6..aae20cb 100644 (file)
--- a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch
+++ b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch
@@ -5,12 +5,23 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  drivers/net/ethernet/broadcom/bgmac.c |    4 ++++
  1 file changed, 4 insertions(+)
 
+--- a/drivers/net/ethernet/broadcom/Kconfig
++++ b/drivers/net/ethernet/broadcom/Kconfig
+@@ -132,7 +132,7 @@ config BNX2X_SRIOV
+ 
+ config BGMAC
+       tristate "BCMA bus GBit core support"
+-      depends on BCMA_HOST_SOC && HAS_DMA && BCM47XX
++      depends on BCMA_HOST_SOC && HAS_DMA
+       select PHYLIB
+       ---help---
+         This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus.
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -16,7 +16,11 @@
- #include <linux/phy.h>
+@@ -17,7 +17,11 @@
  #include <linux/interrupt.h>
  #include <linux/dma-mapping.h>
+ #include <linux/platform_data/b53.h>
 +#ifdef CONFIG_BCM47XX
  #include <bcm47xx_nvram.h>
 +#else
@@ -19,3 +30,32 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
  static const struct bcma_device_id bgmac_bcma_tbl[] = {
        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
+@@ -1490,7 +1494,7 @@ static int bgmac_probe(struct bcma_devic
+       int err;
+ 
+       /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */
+-      if (core->core_unit > 1) {
++      if (core->core_unit > 0) {
+               pr_err("Unsupported core_unit %d\n", core->core_unit);
+               return -ENOTSUPP;
+       }
+@@ -1528,8 +1532,7 @@ static int bgmac_probe(struct bcma_devic
+       }
+       bgmac->cmn = core->bus->drv_gmac_cmn.core;
+ 
+-      bgmac->phyaddr = core->core_unit ? sprom->et1phyaddr :
+-                       sprom->et0phyaddr;
++      bgmac->phyaddr = 30;
+       bgmac->phyaddr &= BGMAC_PHY_MASK;
+       if (bgmac->phyaddr == BGMAC_PHY_MASK) {
+               bgmac_err(bgmac, "No PHY found\n");
+@@ -1579,8 +1582,7 @@ static int bgmac_probe(struct bcma_devic
+       /* TODO: reset the external phy. Specs are needed */
+       bgmac_phy_reset(bgmac);
+ 
+-      bgmac->has_robosw = !!(core->bus->sprom.boardflags_lo &
+-                             BGMAC_BFL_ENETROBO);
++      bgmac->has_robosw = 1;
+       if (bgmac->has_robosw)
+               bgmac_warn(bgmac, "Support for Roboswitch not implemented\n");
+