Commit 8da07830 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville

ath9k: Move LNA code to antenna.c

And use a helper function to setup antennae after a reset.
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent af68abad
...@@ -4,7 +4,8 @@ ath9k-y += beacon.o \ ...@@ -4,7 +4,8 @@ ath9k-y += beacon.o \
main.o \ main.o \
recv.o \ recv.o \
xmit.o \ xmit.o \
link.o link.o \
antenna.o
ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o
ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o
......
This diff is collapsed.
...@@ -528,8 +528,10 @@ static inline void ath_deinit_leds(struct ath_softc *sc) ...@@ -528,8 +528,10 @@ static inline void ath_deinit_leds(struct ath_softc *sc)
} }
#endif #endif
/*******************************/
/* Antenna diversity/combining */ /* Antenna diversity/combining */
/*******************************/
#define ATH_ANT_RX_CURRENT_SHIFT 4 #define ATH_ANT_RX_CURRENT_SHIFT 4
#define ATH_ANT_RX_MAIN_SHIFT 2 #define ATH_ANT_RX_MAIN_SHIFT 2
#define ATH_ANT_RX_MASK 0x3 #define ATH_ANT_RX_MASK 0x3
...@@ -582,6 +584,9 @@ struct ath_ant_comb { ...@@ -582,6 +584,9 @@ struct ath_ant_comb {
unsigned long scan_start_time; unsigned long scan_start_time;
}; };
void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs);
void ath_ant_comb_update(struct ath_softc *sc);
/********************/ /********************/
/* Main driver core */ /* Main driver core */
/********************/ /********************/
......
...@@ -228,21 +228,8 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) ...@@ -228,21 +228,8 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
ath_restart_work(sc); ath_restart_work(sc);
} }
if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) { if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3)
struct ath_hw_antcomb_conf div_ant_conf; ath_ant_comb_update(sc);
u8 lna_conf;
ath9k_hw_antdiv_comb_conf_get(ah, &div_ant_conf);
if (sc->ant_rx == 1)
lna_conf = ATH_ANT_DIV_COMB_LNA1;
else
lna_conf = ATH_ANT_DIV_COMB_LNA2;
div_ant_conf.main_lna_conf = lna_conf;
div_ant_conf.alt_lna_conf = lna_conf;
ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf);
}
ieee80211_wake_queues(sc->hw); ieee80211_wake_queues(sc->hw);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment