mirror of
https://github.com/torvalds/linux.git
synced 2024-12-06 02:52:22 +00:00
brcmsmac: add a conditions for core rev 17 again
This reverts some changes made in this commit:
commit 7234592364
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>
This commit is contained in:
parent
a5fed0c1e4
commit
0d3b9dd1a3
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user