diff options
author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2013-11-18 14:06:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-12-05 14:56:21 -0500 |
commit | 8a7192080f45f2e7858bc4448f45a9d05f7f4da3 (patch) | |
tree | 2a8e790e648690aaf95674cea36e9830f229334b /drivers/net/wireless/rtlwifi/rtl8192cu | |
parent | d3af1ce1388b00f8335ce3f9720032168d41e3c7 (diff) |
rtlwifi: rtl8192cu: Bring rtl92cu_phy_bb_config() up to date
The latest vendor driver contains some changes not in the kernel version.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192cu')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c index 34e56308301e..0c09240eadcc 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | |||
@@ -120,6 +120,7 @@ bool rtl92cu_phy_bb_config(struct ieee80211_hw *hw) | |||
120 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 120 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
121 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | 121 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); |
122 | u16 regval; | 122 | u16 regval; |
123 | u32 regval32; | ||
123 | u8 b_reg_hwparafile = 1; | 124 | u8 b_reg_hwparafile = 1; |
124 | 125 | ||
125 | _rtl92c_phy_init_bb_rf_register_definition(hw); | 126 | _rtl92c_phy_init_bb_rf_register_definition(hw); |
@@ -135,8 +136,11 @@ bool rtl92cu_phy_bb_config(struct ieee80211_hw *hw) | |||
135 | } else if (IS_HARDWARE_TYPE_8192CU(rtlhal)) { | 136 | } else if (IS_HARDWARE_TYPE_8192CU(rtlhal)) { |
136 | rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD | | 137 | rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD | |
137 | FEN_BB_GLB_RSTn | FEN_BBRSTB); | 138 | FEN_BB_GLB_RSTn | FEN_BBRSTB); |
138 | rtl_write_byte(rtlpriv, REG_LDOHCI12_CTRL, 0x0f); | ||
139 | } | 139 | } |
140 | regval32 = rtl_read_dword(rtlpriv, 0x87c); | ||
141 | rtl_write_dword(rtlpriv, 0x87c, regval32 & (~BIT(31))); | ||
142 | if (IS_HARDWARE_TYPE_8192CU(rtlhal)) | ||
143 | rtl_write_byte(rtlpriv, REG_LDOHCI12_CTRL, 0x0f); | ||
140 | rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80); | 144 | rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80); |
141 | if (b_reg_hwparafile == 1) | 145 | if (b_reg_hwparafile == 1) |
142 | rtstatus = _rtl92c_phy_bb8192c_config_parafile(hw); | 146 | rtstatus = _rtl92c_phy_bb8192c_config_parafile(hw); |