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/nicpci.c | |
| parent | 2b2715b83c433d22b10bd654e102baea6f5589b0 (diff) | |
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/nicpci.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/nicpci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c index 7fad6dc1925..6cabc226c0e 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c @@ -714,7 +714,10 @@ static void pcie_war_pci_setup(struct pcicore_info *pi) void pcicore_attach(struct pcicore_info *pi, int state) { struct si_pub *sih = pi->sih; - u32 bfl2 = (u32)getintvar(sih, BRCMS_SROM_BOARDFLAGS2); + struct ssb_sprom *sprom = &pi->core->bus->sprom; + u32 bfl2; + + bfl2 = sprom->boardflags2_lo + (sprom->boardflags2_hi << 16); /* Determine if this board needs override */ if (PCIE_ASPM(sih)) { |