kernel: bgmac: move bgmac patches already applied in mainline kernel to generic

[openwrt/staging/wigyori.git] / target / linux / bcm53xx / patches-3.10 / 204-bgmac-add-supprot-for-BCM4707.patch

diff --git a/target/linux/bcm53xx/patches-3.10/204-bgmac-add-supprot-for-BCM4707.patch b/target/linux/bcm53xx/patches-3.10/204-bgmac-add-supprot-for-BCM4707.patch
index a14b57c60238f7d64f2651d1083f2b806b678c67..63959a957013ab427e4710f95ecb1045836fe229 100644 (file)
--- a/target/linux/bcm53xx/patches-3.10/204-bgmac-add-supprot-for-BCM4707.patch
+++ b/target/linux/bcm53xx/patches-3.10/204-bgmac-add-supprot-for-BCM4707.patch
@@ -9,7 +9,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -842,6 +842,8 @@ static void bgmac_speed(struct bgmac *bg
+@@ -868,6 +868,8 @@ static void bgmac_speed(struct bgmac *bg
                set |= BGMAC_CMDCFG_ES_100;
        if (speed & BGMAC_SPEED_1000)
                set |= BGMAC_CMDCFG_ES_1000;
@@ -18,7 +18,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        if (!bgmac->full_duplex)
                set |= BGMAC_CMDCFG_HD;
        bgmac_cmdcfg_maskset(bgmac, mask, set, true);
-@@ -849,13 +851,28 @@ static void bgmac_speed(struct bgmac *bg
+@@ -875,13 +877,28 @@ static void bgmac_speed(struct bgmac *bg
  
  static void bgmac_miiconfig(struct bgmac *bgmac)
  {
@@ -53,7 +53,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        }
  }
  
-@@ -901,7 +918,8 @@ static void bgmac_chip_reset(struct bgma
+@@ -927,7 +944,8 @@ static void bgmac_chip_reset(struct bgma
  
        bcma_core_enable(core, flags);
  
@@ -63,7 +63,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
                bgmac_set(bgmac, BCMA_CLKCTLST, 1 << 8);
                bgmac_wait_value(bgmac->core, BCMA_CLKCTLST, 1 << 24, 1 << 24,
                                 1000);
-@@ -922,10 +940,13 @@ static void bgmac_chip_reset(struct bgma
+@@ -948,10 +966,13 @@ static void bgmac_chip_reset(struct bgma
                        et_swtype &= 0x0f;
                        et_swtype <<= 4;
                        sw_type = et_swtype;
@@ -80,7 +80,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
                        sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII |
                                  BGMAC_CHIPCTL_1_SW_TYPE_RGMII;
                }
-@@ -1030,12 +1051,15 @@ static void bgmac_enable(struct bgmac *b
+@@ -1058,12 +1079,15 @@ static void bgmac_enable(struct bgmac *b
                break;
        }