Commit fe12946e authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k: Enable btcoex based on the subsystem id of the device 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent aeac355d

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

+23 −0
Original line number Diff line number Diff line
@@ -19,6 +19,29 @@ 
static const struct ath_btcoex_config ath_bt_config = { 0, true, true,

			ATH_BT_COEX_MODE_SLOTTED, true, true, 2, 5, true };



static const u16 ath_subsysid_tbl[] = {

	AR9280_COEX2WIRE_SUBSYSID,

	AT9285_COEX3WIRE_SA_SUBSYSID,

	AT9285_COEX3WIRE_DA_SUBSYSID

};



/*

 * Checks the subsystem id of the device to see if it

 * supports btcoex

 */

bool ath_btcoex_supported(u16 subsysid)

{

	int i;



	if (!subsysid)

		return false;



	for (i = 0; i < ARRAY_SIZE(ath_subsysid_tbl); i++)

		if (subsysid == ath_subsysid_tbl[i])

			return true;



	return false;

}



/*

 * Detects if there is any priority bt traffic

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

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ struct ath_btcoex_info { 
	struct ath_gen_timer *no_stomp_timer; /*Timer for no BT stomping*/

};



bool ath_btcoex_supported(u16 subsysid);

int ath9k_hw_btcoex_init(struct ath_hw *ah);

void ath9k_hw_btcoex_enable(struct ath_hw *ah);

void ath9k_hw_btcoex_disable(struct ath_hw *ah);

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

+2 −1
Original line number Diff line number Diff line
@@ -3690,7 +3690,8 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah) 
	pCap->num_antcfg_2ghz =

		ah->eep_ops->get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ);



	if (AR_SREV_9280_10_OR_LATER(ah) && btcoex_enable) {

	if (AR_SREV_9280_10_OR_LATER(ah) &&

	    ath_btcoex_supported(ah->hw_version.subsysid)) {

		btcoex_info->btactive_gpio = ATH_BTACTIVE_GPIO;

		btcoex_info->wlanactive_gpio = ATH_WLANACTIVE_GPIO;

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

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ 
#define AR5416_DEVID_AR9287_PCI  0x002D

#define AR5416_DEVID_AR9287_PCIE 0x002E



#define AR9280_COEX2WIRE_SUBSYSID	0x309b

#define AT9285_COEX3WIRE_SA_SUBSYSID	0x30aa

#define AT9285_COEX3WIRE_DA_SUBSYSID	0x30ab



/* Register read/write primitives */

#define REG_WRITE(_ah, _reg, _val) ath9k_iowrite32((_ah), (_reg), (_val))

#define REG_READ(_ah, _reg) ath9k_ioread32((_ah), (_reg))