Commit d3c83ac1 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Initialize MCI params using a helper 



Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea510e4b

drivers/net/wireless/ath/ath9k/btcoex.c

+24 −0
Original line number Diff line number Diff line
@@ -152,6 +152,30 @@ void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah) 
}

EXPORT_SYMBOL(ath9k_hw_btcoex_init_3wire);



void ath9k_hw_btcoex_init_mci(struct ath_hw *ah)

{

	ah->btcoex_hw.mci.ready = false;

	ah->btcoex_hw.mci.bt_state = 0;

	ah->btcoex_hw.mci.bt_ver_major = 3;

	ah->btcoex_hw.mci.bt_ver_minor = 0;

	ah->btcoex_hw.mci.bt_version_known = false;

	ah->btcoex_hw.mci.update_2g5g = true;

	ah->btcoex_hw.mci.is_2g = true;

	ah->btcoex_hw.mci.wlan_channels_update = false;

	ah->btcoex_hw.mci.wlan_channels[0] = 0x00000000;

	ah->btcoex_hw.mci.wlan_channels[1] = 0xffffffff;

	ah->btcoex_hw.mci.wlan_channels[2] = 0xffffffff;

	ah->btcoex_hw.mci.wlan_channels[3] = 0x7fffffff;

	ah->btcoex_hw.mci.query_bt = true;

	ah->btcoex_hw.mci.unhalt_bt_gpm = true;

	ah->btcoex_hw.mci.halted_bt_gpm = false;

	ah->btcoex_hw.mci.need_flush_btinfo = false;

	ah->btcoex_hw.mci.wlan_cal_seq = 0;

	ah->btcoex_hw.mci.wlan_cal_done = 0;

	ah->btcoex_hw.mci.config = 0x2201;

}

EXPORT_SYMBOL(ath9k_hw_btcoex_init_mci);



static void ath9k_hw_btcoex_enable_2wire(struct ath_hw *ah)

{

	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;

drivers/net/wireless/ath/ath9k/btcoex.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ struct ath_btcoex_hw { 


void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah);

void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah);

void ath9k_hw_btcoex_init_mci(struct ath_hw *ah);

void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum);

void ath9k_hw_btcoex_set_weight(struct ath_hw *ah,

				u32 bt_weight,

drivers/net/wireless/ath/ath9k/init.c

+2 −21
Original line number Diff line number Diff line
@@ -449,27 +449,8 @@ static int ath9k_init_btcoex(struct ath_softc *sc) 
		if (r)

			return r;



		if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI) {

			ah->btcoex_hw.mci.ready = false;

			ah->btcoex_hw.mci.bt_state = 0;

			ah->btcoex_hw.mci.bt_ver_major = 3;

			ah->btcoex_hw.mci.bt_ver_minor = 0;

			ah->btcoex_hw.mci.bt_version_known = false;

			ah->btcoex_hw.mci.update_2g5g = true;

			ah->btcoex_hw.mci.is_2g = true;

			ah->btcoex_hw.mci.wlan_channels_update = false;

			ah->btcoex_hw.mci.wlan_channels[0] = 0x00000000;

			ah->btcoex_hw.mci.wlan_channels[1] = 0xffffffff;

			ah->btcoex_hw.mci.wlan_channels[2] = 0xffffffff;

			ah->btcoex_hw.mci.wlan_channels[3] = 0x7fffffff;

			ah->btcoex_hw.mci.query_bt = true;

			ah->btcoex_hw.mci.unhalt_bt_gpm = true;

			ah->btcoex_hw.mci.halted_bt_gpm = false;

			ah->btcoex_hw.mci.need_flush_btinfo = false;

			ah->btcoex_hw.mci.wlan_cal_seq = 0;

			ah->btcoex_hw.mci.wlan_cal_done = 0;

			ah->btcoex_hw.mci.config = 0x2201;

		}

		ath9k_hw_btcoex_init_mci(ah);



		break;

	default:

		WARN_ON(1);