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

Commit 8afbcc8b authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by John W. Linville
Browse files

ath9k_hw: define antenna diversity group 



AR9285 belongs to diversity group 0 and AR9485 belongs to diversity
group 2. Based on the diversity group we configure certain antenna
diversity paramaters such as lna1_lna2_delta and fast diversity
bias values. For AR9485 we have some gain table parameter which
selects the gain table 0/1 for main and alternate antenna

Cc: Gabriel Tseng <Gabriel.Tseng@Atheros.com>
Cc: Senthilkumar Balasubramanian <Senthilkumar.Balasubramanian@Atheros.com>
Signed-off-by: default avatarMohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6bcbc062

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

+2 −0
Original line number Diff line number Diff line
@@ -529,6 +529,8 @@ static void ar9002_hw_antdiv_comb_conf_get(struct ath_hw *ah, 
				 AR_PHY_9285_ANT_DIV_ALT_LNACONF_S;

	antconf->fast_div_bias = (regval & AR_PHY_9285_FAST_DIV_BIAS) >>

				  AR_PHY_9285_FAST_DIV_BIAS_S;

	antconf->lna1_lna2_delta = -3;

	antconf->div_group = 0;

}



static void ar9002_hw_antdiv_comb_conf_set(struct ath_hw *ah,

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

+2 −0
Original line number Diff line number Diff line
@@ -1196,6 +1196,8 @@ static void ar9003_hw_antdiv_comb_conf_get(struct ath_hw *ah, 
				 AR_PHY_9485_ANT_DIV_ALT_LNACONF_S;

	antconf->fast_div_bias = (regval & AR_PHY_9485_ANT_FAST_DIV_BIAS) >>

				  AR_PHY_9485_ANT_FAST_DIV_BIAS_S;

	antconf->lna1_lna2_delta = -9;

	antconf->div_group = 2;

}



static void ar9003_hw_antdiv_comb_conf_set(struct ath_hw *ah,

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

+0 −1
Original line number Diff line number Diff line
@@ -483,7 +483,6 @@ static inline void ath_deinit_leds(struct ath_softc *sc) 
#define ATH_ANT_DIV_COMB_ALT_ANT_RATIO 30

#define ATH_ANT_DIV_COMB_ALT_ANT_RATIO2 20



#define ATH_ANT_DIV_COMB_LNA1_LNA2_DELTA -3

#define ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA -1

#define ATH_ANT_DIV_COMB_LNA1_DELTA_HI -4

#define ATH_ANT_DIV_COMB_LNA1_DELTA_MID -2

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

+1 −0
Original line number Diff line number Diff line
@@ -482,6 +482,7 @@ struct ath_hw_antcomb_conf { 
	u8 main_gaintb;

	u8 alt_gaintb;

	int lna1_lna2_delta;

	u8 div_group;

};



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -1442,7 +1442,7 @@ static void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs) 
		}



		if ((alt_rssi_avg < (main_rssi_avg +

		    ATH_ANT_DIV_COMB_LNA1_LNA2_DELTA)))

						div_ant_conf.lna1_lna2_delta)))

			goto div_comb_done;

	}