diff options
| author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-23 11:49:27 +0000 |
|---|---|---|
| committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-23 11:49:27 +0000 |
| commit | cb28cad0c124abe6523cab06b3245bf572a5bff9 (patch) | |
| tree | 8c9eef676ba17a2c60e1d1925bfbf6fed7d8ba2c /target/linux/brcm47xx/patches-2.6.34 | |
| parent | 2479c0db54c659529ac1475f3f30cf27149d90c3 (diff) | |
brcm47xx: fix phy isolation bit on Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W and alike boards (closes #6789)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21108 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.34')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch index 72a37d61a..1f8de8d9b 100644 --- a/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch +++ b/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch @@ -9,7 +9,7 @@ extern char *nvram_get(char *name); static void b44_wap54g10_workaround(struct b44 *bp) { -@@ -421,12 +421,40 @@ static inline void b44_wap54g10_workarou +@@ -421,12 +421,45 @@ static inline void b44_wap54g10_workarou } #endif @@ -23,13 +23,18 @@ + +static inline void b44_bcm47xx_workarounds(struct b44 *bp) +{ -+ /* WL-HDD */ -+ struct ssb_device *sdev = bp->sdev; -+ if (startswith(getvar("hardware_version"), "WL300-")) -+ { -+ if (sdev->bus->sprom.et0phyaddr == 0 && -+ sdev->bus->sprom.et1phyaddr == 1) -+ bp->phy_addr = B44_PHY_ADDR_NO_PHY; ++ /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */ ++ if (simple_strtoul(getvar("boardnum"), NULL, 0) == 100) { ++ bp->phy_addr = B44_PHY_ADDR_NO_PHY; ++ } else { ++ /* WL-HDD */ ++ struct ssb_device *sdev = bp->sdev; ++ if (startswith(getvar("hardware_version"), "WL300-")) ++ { ++ if (sdev->bus->sprom.et0phyaddr == 0 && ++ sdev->bus->sprom.et1phyaddr == 1) ++ bp->phy_addr = B44_PHY_ADDR_NO_PHY; ++ } + } + return; +} @@ -50,7 +55,7 @@ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) return 0; -@@ -2089,6 +2117,8 @@ static int __devinit b44_get_invariants( +@@ -2089,6 +2122,8 @@ static int __devinit b44_get_invariants( * valid PHY address. */ bp->phy_addr &= 0x1F; |