aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/gpio.c
diff options
context:
space:
mode:
authorRajkumar Manoharan <rmanohar@qca.qualcomm.com>2012-04-19 09:43:52 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-04-23 15:35:30 -0400
commit0466e2547d05a9ae8d49afc67a3851d034a528f8 (patch)
tree5437895999d3d44092135cd8346f7b41f7c54b90 /drivers/net/wireless/ath/ath9k/gpio.c
parented2578cd24d033dcaa046b7324e91215ae1fdd8d (diff)
ath9k_hw: remove ATH_BTCOEX_CFG_MCI
AR9462 uses modified version of 3-Wire hw scheme for btcoex. MCI itself is not a separate hw scheme but it aids to manage multiple bt profiles. In ar9462, bt priority traffic is identified by the number of bt profile types instead of gpio. So that this patch removes MCI hw scheme. Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/gpio.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/gpio.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index dd10f4ac03ef..281a9af0f1b6 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -365,7 +365,7 @@ void ath9k_stop_btcoex(struct ath_softc *sc)
365 ath9k_hw_btcoex_disable(ah); 365 ath9k_hw_btcoex_disable(ah);
366 if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE) 366 if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE)
367 ath9k_btcoex_timer_pause(sc); 367 ath9k_btcoex_timer_pause(sc);
368 if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_MCI) 368 if (AR_SREV_9462(ah))
369 ath_mci_flush_profile(&sc->btcoex.mci); 369 ath_mci_flush_profile(&sc->btcoex.mci);
370 } 370 }
371} 371}
@@ -376,7 +376,7 @@ void ath9k_deinit_btcoex(struct ath_softc *sc)
376 ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_3WIRE) 376 ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_3WIRE)
377 ath_gen_timer_free(sc->sc_ah, sc->btcoex.no_stomp_timer); 377 ath_gen_timer_free(sc->sc_ah, sc->btcoex.no_stomp_timer);
378 378
379 if (ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_MCI) 379 if (AR_SREV_9462(sc->sc_ah))
380 ath_mci_cleanup(sc); 380 ath_mci_cleanup(sc);
381} 381}
382 382
@@ -402,17 +402,16 @@ int ath9k_init_btcoex(struct ath_softc *sc)
402 txq = sc->tx.txq_map[WME_AC_BE]; 402 txq = sc->tx.txq_map[WME_AC_BE];
403 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum); 403 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);
404 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW; 404 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
405 break; 405 if (AR_SREV_9462(ah)) {
406 case ATH_BTCOEX_CFG_MCI: 406 sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
407 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW; 407 INIT_LIST_HEAD(&sc->btcoex.mci.info);
408 sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
409 INIT_LIST_HEAD(&sc->btcoex.mci.info);
410 408
411 r = ath_mci_setup(sc); 409 r = ath_mci_setup(sc);
412 if (r) 410 if (r)
413 return r; 411 return r;
414 412
415 ath9k_hw_btcoex_init_mci(ah); 413 ath9k_hw_btcoex_init_mci(ah);
414 }
416 415
417 break; 416 break;
418 default: 417 default: