diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-05-12 20:28:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-05-12 20:28:39 +0000 |
| commit | 847f0e0f12dcd8fa0e7161dd507fd9f54a270159 (patch) | |
| tree | 13496a64208ab1608ac21da22c9b0edefc11971c /target/linux/brcm47xx/patches-2.6.33 | |
| parent | f4b0f28250940e4bc3708e1a76d5ed9088db6181 (diff) | |
| download | upstream-847f0e0f12dcd8fa0e7161dd507fd9f54a270159.tar.gz upstream-847f0e0f12dcd8fa0e7161dd507fd9f54a270159.tar.bz2 upstream-847f0e0f12dcd8fa0e7161dd507fd9f54a270159.zip | |
brcm47xx: use tab instead of space
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21430 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.33/210-b44_phy_fix.patch | 28 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.33/275-usb2-bcm5354-init.patch | 13 |
2 files changed, 21 insertions, 20 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.33/210-b44_phy_fix.patch index 11c6e5abbc..68c954f44c 100644 --- a/target/linux/brcm47xx/patches-2.6.33/210-b44_phy_fix.patch +++ b/target/linux/brcm47xx/patches-2.6.33/210-b44_phy_fix.patch @@ -32,20 +32,20 @@ + +static inline void b44_bcm47xx_workarounds(struct b44 *bp) +{ -+ /* 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; ++ /* 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; +} + +#else diff --git a/target/linux/brcm47xx/patches-2.6.33/275-usb2-bcm5354-init.patch b/target/linux/brcm47xx/patches-2.6.33/275-usb2-bcm5354-init.patch index 6f193bc09f..3d8327ebfd 100644 --- a/target/linux/brcm47xx/patches-2.6.33/275-usb2-bcm5354-init.patch +++ b/target/linux/brcm47xx/patches-2.6.33/275-usb2-bcm5354-init.patch @@ -41,18 +41,19 @@ Signed-off-by: Steve Brown <sbrown@cortland.com> - ssb_write32(dev, 0x400, tmp); - tmp = ssb_read32(dev, 0x400); - printk("USB20H fcr: 0x%0x\n", tmp); -+ /* Work around for 5354 failures */ -+ if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) { -+ /* Change syn01 reg */ -+ tmp = 0x00fe00fe; -+ ssb_write32(dev, 0x894, tmp); - +- - /* Change Shim control reg */ - tmp = ssb_read32(dev, 0x304); - tmp &= ~0x100; - ssb_write32(dev, 0x304, tmp); - tmp = ssb_read32(dev, 0x304); - printk("USB20H shim: 0x%0x\n", tmp); ++ /* Work around for 5354 failures */ ++ if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) { ++ /* Change syn01 reg */ ++ tmp = 0x00fe00fe; ++ ssb_write32(dev, 0x894, tmp); ++ + /* Change syn03 reg */ + tmp = ssb_read32(dev, 0x89c); + tmp |= 0x1; |