CC: kernel: update to 3.18.45, refresh targets

[15.05/openwrt.git] / target / linux / generic / patches-3.18 / 773-bgmac-add-srab-switch.patch

diff --git a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
index 2219f85..9f39c80 100644 (file)
--- a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
@@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #include <bcm47xx_nvram.h>
  
  static const struct bcma_device_id bgmac_bcma_tbl[] = {
-@@ -1524,6 +1525,17 @@ static void bgmac_mii_unregister(struct 
+@@ -1544,6 +1545,17 @@ static void bgmac_mii_unregister(struct
        mdiobus_free(mii_bus);
  }
  
@@ -30,13 +30,11 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  /**************************************************
   * BCMA bus ops
   **************************************************/
-@@ -1647,6 +1659,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1688,6 +1700,14 @@ static int bgmac_probe(struct bcma_devic
        net_dev->hw_features = net_dev->features;
        net_dev->vlan_features = net_dev->features;
  
-+      if ((ci->id == BCMA_CHIP_ID_BCM4707 ||
-+           ci->id == BCMA_CHIP_ID_BCM53018) &&
-+          !bgmac_b53_pdata.regs) {
++      if (bgmac_is_bcm4707_family(bgmac) && !bgmac_b53_pdata.regs) {
 +              bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
 +
 +              err = platform_device_register(&bgmac_b53_dev);
@@ -47,7 +45,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        err = register_netdev(bgmac->net_dev);
        if (err) {
                bgmac_err(bgmac, "Cannot register net device\n");
-@@ -1673,6 +1695,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1714,6 +1734,10 @@ static void bgmac_remove(struct bcma_dev
  {
        struct bgmac *bgmac = bcma_get_drvdata(core);