diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2011-05-05 06:46:04 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-05 14:59:23 -0400 |
commit | eee40820e95e6dbd7b0709e7b8cca453004ae7b1 (patch) | |
tree | 06cd45bb209f049e02b7ab4f6f59201b07d4a135 /drivers | |
parent | fc2b1e0cfe9b4cabde8afeacc2bb81a95bf83afb (diff) |
b43legacy: 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>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index c7fd73e3ad76..2162663293c0 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -3104,37 +3104,6 @@ static void setup_struct_wldev_for_init(struct b43legacy_wldev *dev) | |||
3104 | memset(&dev->noisecalc, 0, sizeof(dev->noisecalc)); | 3104 | memset(&dev->noisecalc, 0, sizeof(dev->noisecalc)); |
3105 | } | 3105 | } |
3106 | 3106 | ||
3107 | static void b43legacy_imcfglo_timeouts_workaround(struct b43legacy_wldev *dev) | ||
3108 | { | ||
3109 | #ifdef CONFIG_SSB_DRIVER_PCICORE | ||
3110 | struct ssb_bus *bus = dev->dev->bus; | ||
3111 | u32 tmp; | ||
3112 | |||
3113 | if (bus->pcicore.dev && | ||
3114 | bus->pcicore.dev->id.coreid == SSB_DEV_PCI && | ||
3115 | bus->pcicore.dev->id.revision <= 5) { | ||
3116 | /* IMCFGLO timeouts workaround. */ | ||
3117 | tmp = ssb_read32(dev->dev, SSB_IMCFGLO); | ||
3118 | switch (bus->bustype) { | ||
3119 | case SSB_BUSTYPE_PCI: | ||
3120 | case SSB_BUSTYPE_PCMCIA: | ||
3121 | tmp &= ~SSB_IMCFGLO_REQTO; | ||
3122 | tmp &= ~SSB_IMCFGLO_SERTO; | ||
3123 | tmp |= 0x32; | ||
3124 | break; | ||
3125 | case SSB_BUSTYPE_SSB: | ||
3126 | tmp &= ~SSB_IMCFGLO_REQTO; | ||
3127 | tmp &= ~SSB_IMCFGLO_SERTO; | ||
3128 | tmp |= 0x53; | ||
3129 | break; | ||
3130 | default: | ||
3131 | break; | ||
3132 | } | ||
3133 | ssb_write32(dev->dev, SSB_IMCFGLO, tmp); | ||
3134 | } | ||
3135 | #endif /* CONFIG_SSB_DRIVER_PCICORE */ | ||
3136 | } | ||
3137 | |||
3138 | static void b43legacy_set_synth_pu_delay(struct b43legacy_wldev *dev, | 3107 | static void b43legacy_set_synth_pu_delay(struct b43legacy_wldev *dev, |
3139 | bool idle) { | 3108 | bool idle) { |
3140 | u16 pu_delay = 1050; | 3109 | u16 pu_delay = 1050; |
@@ -3278,7 +3247,6 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev) | |||
3278 | /* Enable IRQ routing to this device. */ | 3247 | /* Enable IRQ routing to this device. */ |
3279 | ssb_pcicore_dev_irqvecs_enable(&bus->pcicore, dev->dev); | 3248 | ssb_pcicore_dev_irqvecs_enable(&bus->pcicore, dev->dev); |
3280 | 3249 | ||
3281 | b43legacy_imcfglo_timeouts_workaround(dev); | ||
3282 | prepare_phy_data_for_init(dev); | 3250 | prepare_phy_data_for_init(dev); |
3283 | b43legacy_phy_calibrate(dev); | 3251 | b43legacy_phy_calibrate(dev); |
3284 | err = b43legacy_chip_init(dev); | 3252 | err = b43legacy_chip_init(dev); |