diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-03 19:24:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-03 19:24:39 +0000 |
| commit | 24d73fbd338ac8cedc6ec92f8db1738fff1b483b (patch) | |
| tree | eea21c5f6e34ab2a66b865640552288dafbfd9d9 /target/linux/generic/patches-3.10/772-bgmac-add-supprot-for-BCM4707.patch | |
| parent | 45d26941b425db0e3f40479522566f33969702a4 (diff) | |
| download | upstream-24d73fbd338ac8cedc6ec92f8db1738fff1b483b.tar.gz upstream-24d73fbd338ac8cedc6ec92f8db1738fff1b483b.tar.bz2 upstream-24d73fbd338ac8cedc6ec92f8db1738fff1b483b.zip | |
kernel: bgmac: update backport patch
This adds some more bgmac patches from mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38637
Diffstat (limited to 'target/linux/generic/patches-3.10/772-bgmac-add-supprot-for-BCM4707.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/772-bgmac-add-supprot-for-BCM4707.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.10/772-bgmac-add-supprot-for-BCM4707.patch b/target/linux/generic/patches-3.10/772-bgmac-add-supprot-for-BCM4707.patch index 09efbb091d..eb1708a2c4 100644 --- a/target/linux/generic/patches-3.10/772-bgmac-add-supprot-for-BCM4707.patch +++ b/target/linux/generic/patches-3.10/772-bgmac-add-supprot-for-BCM4707.patch @@ -4,7 +4,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -864,6 +864,8 @@ static void bgmac_speed(struct bgmac *bg +@@ -887,6 +887,8 @@ static void bgmac_speed(struct bgmac *bg set |= BGMAC_CMDCFG_ES_100; if (speed & BGMAC_SPEED_1000) set |= BGMAC_CMDCFG_ES_1000; @@ -13,7 +13,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); -@@ -871,13 +873,28 @@ static void bgmac_speed(struct bgmac *bg +@@ -894,13 +896,28 @@ static void bgmac_speed(struct bgmac *bg static void bgmac_miiconfig(struct bgmac *bgmac) { @@ -48,7 +48,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> } } -@@ -923,7 +940,8 @@ static void bgmac_chip_reset(struct bgma +@@ -946,7 +963,8 @@ static void bgmac_chip_reset(struct bgma bcma_core_enable(core, flags); @@ -58,7 +58,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); -@@ -944,10 +962,13 @@ static void bgmac_chip_reset(struct bgma +@@ -967,10 +985,13 @@ static void bgmac_chip_reset(struct bgma et_swtype &= 0x0f; et_swtype <<= 4; sw_type = et_swtype; @@ -75,7 +75,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII | BGMAC_CHIPCTL_1_SW_TYPE_RGMII; } -@@ -1054,12 +1075,15 @@ static void bgmac_enable(struct bgmac *b +@@ -1077,12 +1098,15 @@ static void bgmac_enable(struct bgmac *b break; } |