diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2011-05-05 06:45:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-05 14:59:23 -0400 |
commit | fc2b1e0cfe9b4cabde8afeacc2bb81a95bf83afb (patch) | |
tree | 1ed9978a653dafde903c45901d3d3033b092a174 /drivers/net/wireless/b43/main.c | |
parent | cf3a03b9c99a0b2715741d116f50f513f545bb2d (diff) |
b43: drop invalid IMCFGLO workaround
We were performing it on wrong core, it was outdated and is already
implemented in ssb.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 57eb5b649730..675e288a3c53 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -4212,33 +4212,7 @@ static void b43_bluetooth_coext_disable(struct b43_wldev *dev) | |||
4212 | 4212 | ||
4213 | static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev) | 4213 | static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev) |
4214 | { | 4214 | { |
4215 | #ifdef CONFIG_SSB_DRIVER_PCICORE | 4215 | /* TODO: implement 80211 core workaround here */ |
4216 | struct ssb_bus *bus = dev->dev->bus; | ||
4217 | u32 tmp; | ||
4218 | |||
4219 | if (bus->pcicore.dev && | ||
4220 | bus->pcicore.dev->id.coreid == SSB_DEV_PCI && | ||
4221 | bus->pcicore.dev->id.revision <= 5) { | ||
4222 | /* IMCFGLO timeouts workaround. */ | ||
4223 | tmp = ssb_read32(dev->dev, SSB_IMCFGLO); | ||
4224 | switch (bus->bustype) { | ||
4225 | case SSB_BUSTYPE_PCI: | ||
4226 | case SSB_BUSTYPE_PCMCIA: | ||
4227 | tmp &= ~SSB_IMCFGLO_REQTO; | ||
4228 | tmp &= ~SSB_IMCFGLO_SERTO; | ||
4229 | tmp |= 0x32; | ||
4230 | break; | ||
4231 | case SSB_BUSTYPE_SSB: | ||
4232 | tmp &= ~SSB_IMCFGLO_REQTO; | ||
4233 | tmp &= ~SSB_IMCFGLO_SERTO; | ||
4234 | tmp |= 0x53; | ||
4235 | break; | ||
4236 | default: | ||
4237 | break; | ||
4238 | } | ||
4239 | ssb_write32(dev->dev, SSB_IMCFGLO, tmp); | ||
4240 | } | ||
4241 | #endif /* CONFIG_SSB_DRIVER_PCICORE */ | ||
4242 | } | 4216 | } |
4243 | 4217 | ||
4244 | static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle) | 4218 | static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle) |