diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-29 02:50:25 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 12:45:23 -0400 |
| commit | 898d3c3b2462cd439edb575f43b732425693aff0 (patch) | |
| tree | 51e4fe1eec628acbed53fbfc37808bdc52e401bd /drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | |
| parent | 2b2715b83c433d22b10bd654e102baea6f5589b0 (diff) | |
| download | linux-898d3c3b2462cd439edb575f43b732425693aff0.tar.bz2 | |
brcmsmac: use sprom from bcma
bcma now provides all sprom attributes needed by brcmsmac and also
parses them from the pci sprom ant otp.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Tested-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/aiutils.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c index c93ea35bceec..f0cef235516b 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c @@ -564,6 +564,7 @@ static struct si_info *ai_doattach(struct si_info *sii, u32 w, savewin; struct bcma_device *cc; uint socitype; + struct ssb_sprom *sprom = &pbus->sprom; savewin = 0; @@ -617,7 +618,8 @@ static struct si_info *ai_doattach(struct si_info *sii, } /* setup the GPIO based LED powersave register */ - w = getintvar(sih, BRCMS_SROM_LEDDC); + w = (sprom->leddc_on_time << BCMA_CC_GPIOTIMER_ONTIME_SHIFT) | + (sprom->leddc_off_time << BCMA_CC_GPIOTIMER_OFFTIME_SHIFT); if (w == 0) w = DEFAULT_GPIOTIMERVAL; ai_cc_reg(sih, offsetof(struct chipcregs, gpiotimerval), |