diff options
| author |   Hauke Mehrtens <hauke@hauke-m.de> | 2012-06-30 15:16:15 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-07-10 12:16:53 -0400 |
| commit | 0d3b9dd1a3608eadbd2db157f44bbdd11cf63745 (patch) | |
| tree | 623ee201640b3b2e31b8593feca3d1ec3082da5d /drivers | |
| parent | brcmsmac: remove some unnessessacry casts and void pointer (diff) | |
| download | linux-dev-0d3b9dd1a3608eadbd2db157f44bbdd11cf63745.tar.xz linux-dev-0d3b9dd1a3608eadbd2db157f44bbdd11cf63745.zip | |
brcmsmac: add a conditions for core rev 17 again
This reverts some changes made in this commit:
commit 7234592364e2efe8b4ac1040c99b1d7ef01cf502
Author: Roland Vossen <rvossen@broadcom.com>
Date: Mon Feb 14 12:16:45 2011 +0100
staging: brcm80211: removal of inactive d11 code
The bcm4716 has a rev 17 wireless core and this condition is needed.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index 8bad8b6dad9d..547ae5bca567 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c @@ -1942,7 +1942,8 @@ static bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw) * accesses phyreg throughput mac. This can be skipped since * only mac reg is accessed below */ - flags |= SICF_PCLKE; + if (D11REV_GE(wlc_hw->corerev, 18)) + flags |= SICF_PCLKE; /* * TODO: test suspend/resume @@ -2023,7 +2024,8 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) * phyreg throughput mac, AND phy_reset is skipped at early stage when * band->pi is invalid. need to enable PHY CLK */ - flags |= SICF_PCLKE; + if (D11REV_GE(wlc_hw->corerev, 18)) + flags |= SICF_PCLKE; /* * reset the core |