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

ath9k: Move BTCOEX init/deinit functions to gpio.c 



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

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

+2 −0
Original line number Diff line number Diff line
@@ -454,6 +454,8 @@ struct ath_btcoex { 
	struct ath_mci_profile mci;

};



int ath9k_init_btcoex(struct ath_softc *sc);

void ath9k_deinit_btcoex(struct ath_softc *sc);

int ath_init_btcoex_timer(struct ath_softc *sc);

void ath9k_btcoex_timer_resume(struct ath_softc *sc);

void ath9k_btcoex_timer_pause(struct ath_softc *sc);

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

+51 −0
Original line number Diff line number Diff line
@@ -317,3 +317,54 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc) 


	btcoex->hw_timer_enabled = false;

}



void ath9k_deinit_btcoex(struct ath_softc *sc)

{

        if ((sc->btcoex.no_stomp_timer) &&

	    ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_3WIRE)

		ath_gen_timer_free(sc->sc_ah, sc->btcoex.no_stomp_timer);



	if (ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_MCI)

		ath_mci_cleanup(sc);

}



int ath9k_init_btcoex(struct ath_softc *sc)

{

	struct ath_txq *txq;

	struct ath_hw *ah = sc->sc_ah;

	int r;



	switch (ath9k_hw_get_btcoex_scheme(sc->sc_ah)) {

	case ATH_BTCOEX_CFG_NONE:

		break;

	case ATH_BTCOEX_CFG_2WIRE:

		ath9k_hw_btcoex_init_2wire(sc->sc_ah);

		break;

	case ATH_BTCOEX_CFG_3WIRE:

		ath9k_hw_btcoex_init_3wire(sc->sc_ah);

		r = ath_init_btcoex_timer(sc);

		if (r)

			return -1;

		txq = sc->tx.txq_map[WME_AC_BE];

		ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);

		sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;

		break;

	case ATH_BTCOEX_CFG_MCI:

		sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;

		sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;

		INIT_LIST_HEAD(&sc->btcoex.mci.info);



		r = ath_mci_setup(sc);

		if (r)

			return r;



		ath9k_hw_btcoex_init_mci(ah);



		break;

	default:

		WARN_ON(1);

		break;

	}



	return 0;

}

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

+1 −47
Original line number Diff line number Diff line
@@ -419,47 +419,6 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd, 
	return error;

}



static int ath9k_init_btcoex(struct ath_softc *sc)

{

	struct ath_txq *txq;

	struct ath_hw *ah = sc->sc_ah;

	int r;



	switch (ath9k_hw_get_btcoex_scheme(sc->sc_ah)) {

	case ATH_BTCOEX_CFG_NONE:

		break;

	case ATH_BTCOEX_CFG_2WIRE:

		ath9k_hw_btcoex_init_2wire(sc->sc_ah);

		break;

	case ATH_BTCOEX_CFG_3WIRE:

		ath9k_hw_btcoex_init_3wire(sc->sc_ah);

		r = ath_init_btcoex_timer(sc);

		if (r)

			return -1;

		txq = sc->tx.txq_map[WME_AC_BE];

		ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);

		sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;

		break;

	case ATH_BTCOEX_CFG_MCI:

		sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;

		sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;

		INIT_LIST_HEAD(&sc->btcoex.mci.info);



		r = ath_mci_setup(sc);

		if (r)

			return r;



		ath9k_hw_btcoex_init_mci(ah);



		break;

	default:

		WARN_ON(1);

		break;

	}



	return 0;

}



static int ath9k_init_queues(struct ath_softc *sc)

{

	int i = 0;
@@ -861,12 +820,7 @@ static void ath9k_deinit_softc(struct ath_softc *sc) 
	if (sc->sbands[IEEE80211_BAND_5GHZ].channels)

		kfree(sc->sbands[IEEE80211_BAND_5GHZ].channels);



        if ((sc->btcoex.no_stomp_timer) &&

	    ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_3WIRE)

		ath_gen_timer_free(sc->sc_ah, sc->btcoex.no_stomp_timer);



	if (ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_MCI)

		ath_mci_cleanup(sc);

	ath9k_deinit_btcoex(sc);



	for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)

		if (ATH_TXQ_SETUP(sc, i))