kernel: port missing ubi EOF marker support patch to 3.19 and 4.0

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.19 / 773-bgmac-add-srab-switch.patch

diff --git a/target/linux/generic/patches-3.19/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.19/773-bgmac-add-srab-switch.patch
index bf3ab93830f2f0f12d7f2e879fa2624a8a770199..ef12cac9bffe905ab64013be670119f2f02a37e8 100644 (file)
--- a/target/linux/generic/patches-3.19/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/patches-3.19/773-bgmac-add-srab-switch.patch
@@ -30,12 +30,12 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  /**************************************************
   * BCMA bus ops
   **************************************************/
-@@ -1523,6 +1535,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1524,6 +1536,16 @@ static int bgmac_probe(struct bcma_devic
                goto err_dma_free;
        }
  
-+      if (core->id.id != BCMA_CHIP_ID_BCM4707 &&
-+          core->id.id != BCMA_CHIP_ID_BCM53018 &&
++      if ((ci->id == BCMA_CHIP_ID_BCM4707 ||
++           ci->id == BCMA_CHIP_ID_BCM53018) &&
 +          !bgmac_b53_pdata.regs) {
 +              bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
 +
@@ -47,7 +47,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");
-@@ -1549,6 +1571,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1550,6 +1572,10 @@ static void bgmac_remove(struct bcma_dev
  {
        struct bgmac *bgmac = bcma_get_drvdata(core);