diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-04-23 11:31:54 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-04-23 11:31:54 +0000 |
| commit | 2d8d0aa3529a78e2d74cda928fb167e5d3c73ac5 (patch) | |
| tree | fe7bb924c8a8d42f720b493840b06a800d0f569c /target/linux/brcm47xx/patches-4.0/210-b44_phy_fix.patch | |
| parent | 912768cf9d2b336edfb0a72f79c38738a1591ba1 (diff) | |
| download | master-187ad058-2d8d0aa3529a78e2d74cda928fb167e5d3c73ac5.tar.gz master-187ad058-2d8d0aa3529a78e2d74cda928fb167e5d3c73ac5.tar.bz2 master-187ad058-2d8d0aa3529a78e2d74cda928fb167e5d3c73ac5.zip | |
brcm47xx: add patches for kernel 4.0
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45570 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-4.0/210-b44_phy_fix.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.0/210-b44_phy_fix.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-4.0/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-4.0/210-b44_phy_fix.patch new file mode 100644 index 0000000000..04f6832169 --- /dev/null +++ b/target/linux/brcm47xx/patches-4.0/210-b44_phy_fix.patch @@ -0,0 +1,54 @@ +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -431,10 +431,34 @@ static void b44_wap54g10_workaround(stru + error: + pr_warn("PHY: cannot reset MII transceiver isolate bit\n"); + } ++ ++static void b44_bcm47xx_workarounds(struct b44 *bp) ++{ ++ char buf[20]; ++ struct ssb_device *sdev = bp->sdev; ++ ++ /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */ ++ if (sdev->bus->sprom.board_num == 100) { ++ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY; ++ } else { ++ /* WL-HDD */ ++ if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0 && ++ !strncmp(buf, "WL300-", strlen("WL300-"))) { ++ if (sdev->bus->sprom.et0phyaddr == 0 && ++ sdev->bus->sprom.et1phyaddr == 1) ++ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY; ++ } ++ } ++ return; ++} + #else + static inline void b44_wap54g10_workaround(struct b44 *bp) + { + } ++ ++static inline void b44_bcm47xx_workarounds(struct b44 *bp) ++{ ++} + #endif + + static int b44_setup_phy(struct b44 *bp) +@@ -443,6 +467,7 @@ static int b44_setup_phy(struct b44 *bp) + int err; + + b44_wap54g10_workaround(bp); ++ b44_bcm47xx_workarounds(bp); + + if (bp->flags & B44_FLAG_EXTERNAL_PHY) + return 0; +@@ -2170,6 +2195,8 @@ static int b44_get_invariants(struct b44 + * valid PHY address. */ + bp->phy_addr &= 0x1F; + ++ b44_bcm47xx_workarounds(bp); ++ + memcpy(bp->dev->dev_addr, addr, ETH_ALEN); + + if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){ |