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/stf.c | |
| parent | bcma: add bcma_core_pci_config_fixup() (diff) | |
| download | linux-dev-898d3c3b2462cd439edb575f43b732425693aff0.tar.xz linux-dev-898d3c3b2462cd439edb575f43b732425693aff0.zip | |
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/stf.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/stf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/stf.c b/drivers/net/wireless/brcm80211/brcmsmac/stf.c index d8f528eb180c..ed1d1aa71d2d 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/stf.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/stf.c @@ -370,9 +370,11 @@ void brcms_c_stf_phy_txant_upd(struct brcms_c_info *wlc) void brcms_c_stf_phy_chain_calc(struct brcms_c_info *wlc) { + struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom; + /* get available rx/tx chains */ - wlc->stf->hw_txchain = (u8) getintvar(wlc->hw->sih, BRCMS_SROM_TXCHAIN); - wlc->stf->hw_rxchain = (u8) getintvar(wlc->hw->sih, BRCMS_SROM_RXCHAIN); + wlc->stf->hw_txchain = sprom->txchain; + wlc->stf->hw_rxchain = sprom->rxchain; /* these parameter are intended to be used for all PHY types */ if (wlc->stf->hw_txchain == 0 || wlc->stf->hw_txchain == 0xf) { |