diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2013-07-14 13:44:45 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-07-14 13:44:45 +0000 |
| commit | d631e85a63d24c378d23ce10fca3f3846ccae9ab (patch) | |
| tree | bae55f3e27f76f5ad1220579179cacfbfb41d373 /target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch | |
| parent | 652844194b32dc902d40b7a34a4f37b39727b627 (diff) | |
| download | master-187ad058-d631e85a63d24c378d23ce10fca3f3846ccae9ab.tar.gz master-187ad058-d631e85a63d24c378d23ce10fca3f3846ccae9ab.tar.bz2 master-187ad058-d631e85a63d24c378d23ce10fca3f3846ccae9ab.zip | |
brcm47xx: add initial support for kernel 3.10
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37287 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch new file mode 100644 index 0000000000..8cf4b0f00c --- /dev/null +++ b/target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch @@ -0,0 +1,54 @@ +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -410,10 +410,34 @@ static void b44_wap54g10_workaround(stru + error: + pr_warning("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_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_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) +@@ -422,6 +446,7 @@ static int b44_setup_phy(struct b44 *bp) + int err; + + b44_wap54g10_workaround(bp); ++ b44_bcm47xx_workarounds(bp); + + if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) + return 0; +@@ -2101,6 +2126,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, 6); + + if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){ |