From 2643f5ec9884262d93aebc38f8120a0260459f70 Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 12 May 2010 20:28:39 +0000 Subject: brcm47xx: use tab instead of space git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21430 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../brcm47xx/patches-2.6.33/210-b44_phy_fix.patch | 28 +++++++++++----------- .../patches-2.6.33/275-usb2-bcm5354-init.patch | 13 +++++----- 2 files changed, 21 insertions(+), 20 deletions(-) (limited to 'target/linux/brcm47xx/patches-2.6.33') 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 11c6e5abb..68c954f44 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 6f193bc09..3d8327ebf 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 - 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; -- cgit v1.2.3