diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-06-30 09:16:11 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-10 12:16:51 -0400 |
commit | 6236dc2e260457e81e84d05151222b2ac17cf7d8 (patch) | |
tree | de0332d5269f6132ce0a19652b27f49d5229a13d /drivers | |
parent | 33ae5a5e1c33e73d50af16f2e91295bc6dd26760 (diff) |
brcmsmac: remove some redundant chip common workarounds
The removed workarounds are already performed in bcma_pmu_workarounds()
and bcma_core_chipcommon_init()
This patch depends on the completion of the workarounds in bcma done in
this commit in my pending patch series for bcma.
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon Jun 4 00:20:26 2012 +0200
bcma: complete workaround for BCMA43224 and BCM4313
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c index c15d9fc2ffd..8c9345dd37d 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | |||
@@ -476,11 +476,7 @@ static struct si_info *ai_doattach(struct si_info *sii, | |||
476 | struct bcma_bus *pbus) | 476 | struct bcma_bus *pbus) |
477 | { | 477 | { |
478 | struct si_pub *sih = &sii->pub; | 478 | struct si_pub *sih = &sii->pub; |
479 | u32 w, savewin; | ||
480 | struct bcma_device *cc; | 479 | struct bcma_device *cc; |
481 | struct ssb_sprom *sprom = &pbus->sprom; | ||
482 | |||
483 | savewin = 0; | ||
484 | 480 | ||
485 | sii->icbus = pbus; | 481 | sii->icbus = pbus; |
486 | sii->pcibus = pbus->host_pci; | 482 | sii->pcibus = pbus->host_pci; |
@@ -506,44 +502,6 @@ static struct si_info *ai_doattach(struct si_info *sii, | |||
506 | (void)si_pmu_measure_alpclk(sih); | 502 | (void)si_pmu_measure_alpclk(sih); |
507 | } | 503 | } |
508 | 504 | ||
509 | /* setup the GPIO based LED powersave register */ | ||
510 | w = (sprom->leddc_on_time << BCMA_CC_GPIOTIMER_ONTIME_SHIFT) | | ||
511 | (sprom->leddc_off_time << BCMA_CC_GPIOTIMER_OFFTIME_SHIFT); | ||
512 | if (w == 0) | ||
513 | w = DEFAULT_GPIOTIMERVAL; | ||
514 | ai_cc_reg(sih, offsetof(struct chipcregs, gpiotimerval), | ||
515 | ~0, w); | ||
516 | |||
517 | if (ai_get_chip_id(sih) == BCM43224_CHIP_ID) { | ||
518 | /* | ||
519 | * enable 12 mA drive strenth for 43224 and | ||
520 | * set chipControl register bit 15 | ||
521 | */ | ||
522 | if (ai_get_chiprev(sih) == 0) { | ||
523 | SI_MSG("Applying 43224A0 WARs\n"); | ||
524 | ai_cc_reg(sih, offsetof(struct chipcregs, chipcontrol), | ||
525 | CCTRL43224_GPIO_TOGGLE, | ||
526 | CCTRL43224_GPIO_TOGGLE); | ||
527 | si_pmu_chipcontrol(sih, 0, CCTRL_43224A0_12MA_LED_DRIVE, | ||
528 | CCTRL_43224A0_12MA_LED_DRIVE); | ||
529 | } | ||
530 | if (ai_get_chiprev(sih) >= 1) { | ||
531 | SI_MSG("Applying 43224B0+ WARs\n"); | ||
532 | si_pmu_chipcontrol(sih, 0, CCTRL_43224B0_12MA_LED_DRIVE, | ||
533 | CCTRL_43224B0_12MA_LED_DRIVE); | ||
534 | } | ||
535 | } | ||
536 | |||
537 | if (ai_get_chip_id(sih) == BCM4313_CHIP_ID) { | ||
538 | /* | ||
539 | * enable 12 mA drive strenth for 4313 and | ||
540 | * set chipControl register bit 1 | ||
541 | */ | ||
542 | SI_MSG("Applying 4313 WARs\n"); | ||
543 | si_pmu_chipcontrol(sih, 0, CCTRL_4313_12MA_LED_DRIVE, | ||
544 | CCTRL_4313_12MA_LED_DRIVE); | ||
545 | } | ||
546 | |||
547 | return sii; | 505 | return sii; |
548 | 506 | ||
549 | exit: | 507 | exit: |