diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-04-23 11:49:27 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-04-23 11:49:27 +0000 |
| commit | 819114e3f29079c52075e16fd9aa95b5adc62da1 (patch) | |
| tree | c13862d3ab6d652577b4db41eec91274de8b5288 /target/linux/brcm47xx/patches-2.6.34 | |
| parent | b1e7cd577b242e177a7a9f4adcd76aad8efd1e90 (diff) | |
| download | upstream-819114e3f29079c52075e16fd9aa95b5adc62da1.tar.gz upstream-819114e3f29079c52075e16fd9aa95b5adc62da1.tar.bz2 upstream-819114e3f29079c52075e16fd9aa95b5adc62da1.zip | |
brcm47xx: fix phy isolation bit on Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W and alike boards (closes #6789)
SVN-Revision: 21108
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 72a37d61a2..1f8de8d9be 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; |