diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-06-30 09:16:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-10 12:16:53 -0400 |
commit | 0d3b9dd1a3608eadbd2db157f44bbdd11cf63745 (patch) | |
tree | 623ee201640b3b2e31b8593feca3d1ec3082da5d /drivers/net/wireless | |
parent | a5fed0c1e48ca6c153e33e63aef406b4ef97cd95 (diff) |
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/net/wireless')
-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) | |||
1942 | * accesses phyreg throughput mac. This can be skipped since | 1942 | * accesses phyreg throughput mac. This can be skipped since |
1943 | * only mac reg is accessed below | 1943 | * only mac reg is accessed below |
1944 | */ | 1944 | */ |
1945 | flags |= SICF_PCLKE; | 1945 | if (D11REV_GE(wlc_hw->corerev, 18)) |
1946 | flags |= SICF_PCLKE; | ||
1946 | 1947 | ||
1947 | /* | 1948 | /* |
1948 | * TODO: test suspend/resume | 1949 | * TODO: test suspend/resume |
@@ -2023,7 +2024,8 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) | |||
2023 | * phyreg throughput mac, AND phy_reset is skipped at early stage when | 2024 | * phyreg throughput mac, AND phy_reset is skipped at early stage when |
2024 | * band->pi is invalid. need to enable PHY CLK | 2025 | * band->pi is invalid. need to enable PHY CLK |
2025 | */ | 2026 | */ |
2026 | flags |= SICF_PCLKE; | 2027 | if (D11REV_GE(wlc_hw->corerev, 18)) |
2028 | flags |= SICF_PCLKE; | ||
2027 | 2029 | ||
2028 | /* | 2030 | /* |
2029 | * reset the core | 2031 | * reset the core |