diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-02 22:24:01 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-02 22:24:01 +0000 |
| commit | 06c8b90ebf32eacd45ff196c4c58e51ec7321868 (patch) | |
| tree | 42bddd590a1d6f0a18365932658c37e660cc280b /target/linux/brcm47xx/patches-3.10/710-bgmac_fix_internal_switch_initialization.patch | |
| parent | 03b0c3b5a6f8c032ba10e1e1193eed1145a996c4 (diff) | |
| download | upstream-06c8b90ebf32eacd45ff196c4c58e51ec7321868.tar.gz upstream-06c8b90ebf32eacd45ff196c4c58e51ec7321868.tar.bz2 upstream-06c8b90ebf32eacd45ff196c4c58e51ec7321868.zip | |
kernel: bgmac: move bgmac patches already applied in mainline kernel to generic
The bgmac driver will be used on the brcm47xx and the bcm53xx target.
These are only the patches already applied in current net-next/master
branch.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38288
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/710-bgmac_fix_internal_switch_initialization.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/710-bgmac_fix_internal_switch_initialization.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/710-bgmac_fix_internal_switch_initialization.patch b/target/linux/brcm47xx/patches-3.10/710-bgmac_fix_internal_switch_initialization.patch deleted file mode 100644 index 8601888498..0000000000 --- a/target/linux/brcm47xx/patches-3.10/710-bgmac_fix_internal_switch_initialization.patch +++ /dev/null @@ -1,33 +0,0 @@ -bgmac: fix internal switch initialization - -Some devices (BCM4749, BCM5357, BCM53572) have internal switch that -requires initialization. We already have code for this, but because -of the typo in code it was never working. This resulted in network not -working for some routers and possibility of soft-bricking them. - -Use correct bit for switch initialization and fix typo in the define. - -Signed-off-by: Rafał Miłecki <zajec5@gmail.com> - ---- a/drivers/net/ethernet/broadcom/bgmac.c -+++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -908,7 +908,7 @@ static void bgmac_chip_reset(struct bgma - struct bcma_drv_cc *cc = &bgmac->core->bus->drv_cc; - u8 et_swtype = 0; - u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY | -- BGMAC_CHIPCTL_1_IF_TYPE_RMII; -+ BGMAC_CHIPCTL_1_IF_TYPE_MII; - char buf[2]; - - if (bcm47xx_nvram_getenv("et_swtype", buf, 1) > 0) { ---- a/drivers/net/ethernet/broadcom/bgmac.h -+++ b/drivers/net/ethernet/broadcom/bgmac.h -@@ -333,7 +333,7 @@ - - #define BGMAC_CHIPCTL_1_IF_TYPE_MASK 0x00000030 - #define BGMAC_CHIPCTL_1_IF_TYPE_RMII 0x00000000 --#define BGMAC_CHIPCTL_1_IF_TYPE_MI 0x00000010 -+#define BGMAC_CHIPCTL_1_IF_TYPE_MII 0x00000010 - #define BGMAC_CHIPCTL_1_IF_TYPE_RGMII 0x00000020 - #define BGMAC_CHIPCTL_1_SW_TYPE_MASK 0x000000C0 - #define BGMAC_CHIPCTL_1_SW_TYPE_EPHY 0x00000000 |