openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtlwifi: btcoex: 21a 1ant: If wifi only, do not initiate coex mechanism 

If the device has wifi mode only, there is no need to initiate the
hardware for wifi and bt coexistence, so just return to avoid it.

Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Yan-Hsuan Chuang 2017-04-10 11:23:05 -05:00 committed by Kalle Valo
parent edf8fa7b66
commit bcdffd050c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
View File

@ -1990,7 +1990,7 @@ static void btc8821a1ant_init_coex_dm(struct btc_coexist *btcoexist)
} }
static void btc8821a1ant_init_hw_config(struct btc_coexist *btcoexist, static void btc8821a1ant_init_hw_config(struct btc_coexist *btcoexist,
bool back_up) bool back_up, bool wifi_only)
{ {
struct rtl_priv *rtlpriv = btcoexist->adapter; struct rtl_priv *rtlpriv = btcoexist->adapter;
u8 u1_tmp = 0; u8 u1_tmp = 0;
@ -1999,6 +1999,9 @@ static void btc8821a1ant_init_hw_config(struct btc_coexist *btcoexist,
RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
"[BTCoex], 1Ant Init HW Config!!\n"); "[BTCoex], 1Ant Init HW Config!!\n");
if (wifi_only)
return;
if (back_up) { if (back_up) {
coex_dm->backup_arfr_cnt1 = btcoexist->btc_read_4byte(btcoexist, coex_dm->backup_arfr_cnt1 = btcoexist->btc_read_4byte(btcoexist,
0x430); 0x430);
@ -2039,9 +2042,9 @@ static void btc8821a1ant_init_hw_config(struct btc_coexist *btcoexist,
/************************************************************** /**************************************************************
* extern function start with ex_btc8821a1ant_ * extern function start with ex_btc8821a1ant_
**************************************************************/ **************************************************************/
void ex_btc8821a1ant_init_hwconfig(struct btc_coexist *btcoexist) void ex_btc8821a1ant_init_hwconfig(struct btc_coexist *btcoexist, bool wifionly)
{ {
btc8821a1ant_init_hw_config(btcoexist, true); btc8821a1ant_init_hw_config(btcoexist, true, wifionly);
} }
void ex_btc8821a1ant_init_coex_dm(struct btc_coexist *btcoexist) void ex_btc8821a1ant_init_coex_dm(struct btc_coexist *btcoexist)
@ -2783,7 +2786,7 @@ void ex_btc8821a1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state)
RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
"[BTCoex], Pnp notify to WAKE UP\n"); "[BTCoex], Pnp notify to WAKE UP\n");
btcoexist->stop_coex_dm = false; btcoexist->stop_coex_dm = false;
btc8821a1ant_init_hw_config(btcoexist, false); btc8821a1ant_init_hw_config(btcoexist, false, false);
btc8821a1ant_init_coex_dm(btcoexist); btc8821a1ant_init_coex_dm(btcoexist);
btc8821a1ant_query_bt_info(btcoexist); btc8821a1ant_query_bt_info(btcoexist);
} }