Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfd0587a authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k: keep btcoex period in milliseconds 



btcoex periord is converted into micro seconds during initialization
and converted back to milli seconds while starting timer. As MCI code
handles btcoex period in msec, lets keep the btcoex timer in msec and
convert them into other form whenever needed.

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9e2e0c84

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

+4 −4
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static void ath_btcoex_period_timer(unsigned long data) 
	}



	ath9k_ps_restore(sc);

	timer_period = btcoex->btcoex_period / 1000;

	timer_period = btcoex->btcoex_period;

	mod_timer(&btcoex->period_timer, jiffies + msecs_to_jiffies(timer_period));

}
@@ -267,10 +267,10 @@ static int ath_init_btcoex_timer(struct ath_softc *sc) 
{

	struct ath_btcoex *btcoex = &sc->btcoex;



	btcoex->btcoex_period = ATH_BTCOEX_DEF_BT_PERIOD * 1000;

	btcoex->btcoex_no_stomp = (100 - ATH_BTCOEX_DEF_DUTY_CYCLE) *

	btcoex->btcoex_period = ATH_BTCOEX_DEF_BT_PERIOD;

	btcoex->btcoex_no_stomp = (100 - ATH_BTCOEX_DEF_DUTY_CYCLE) * 1000 *

		btcoex->btcoex_period / 100;

	btcoex->btscan_no_stomp = (100 - ATH_BTCOEX_BTSCAN_DUTY_CYCLE) *

	btcoex->btscan_no_stomp = (100 - ATH_BTCOEX_BTSCAN_DUTY_CYCLE) * 1000 *

				   btcoex->btcoex_period / 100;



	setup_timer(&btcoex->period_timer, ath_btcoex_period_timer,

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

+1 −2
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ skip_tuning: 
	if (btcoex->duty_cycle > ATH_MCI_MAX_DUTY_CYCLE)

		btcoex->duty_cycle = ATH_MCI_MAX_DUTY_CYCLE;



	btcoex->btcoex_period *= 1000;

	btcoex->btcoex_no_stomp =  btcoex->btcoex_period *

	btcoex->btcoex_no_stomp =  btcoex->btcoex_period * 1000 *

		(100 - btcoex->duty_cycle) / 100;



	ath9k_hw_btcoex_enable(sc->sc_ah);