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

Commit 871d0051 authored by Miaoqing Pan's avatar Miaoqing Pan Committed by Kalle Valo
Browse files

ath9k: rename ini_modes_rxgain_5g_xlna to ini_modes_rxgain_xlna 



rename the variable as preparation for using the array with 2.4 GHz
band, etc.

Signed-off-by: default avatarMiaoqing Pan <miaoqing@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 16a4ea50

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

+5 −5
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ static void ar9003_rx_gain_table_mode0(struct ath_hw *ah) 
			       qca956x_1p0_common_rx_gain_table);

		INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,

			       qca956x_1p0_common_rx_gain_bounds);

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,

			       qca956x_1p0_xlna_only);

	} else if (AR_SREV_9580(ah))

		INIT_INI_ARRAY(&ah->iniModesRxGain,
@@ -942,7 +942,7 @@ static void ar9003_rx_gain_table_mode2(struct ath_hw *ah) 
			       ar9462_2p1_baseband_core_mix_rxgain);

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_bb_postamble,

			       ar9462_2p1_baseband_postamble_mix_rxgain);

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,

			       ar9462_2p1_baseband_postamble_5g_xlna);

	} else if (AR_SREV_9462_20(ah)) {

		INIT_INI_ARRAY(&ah->iniModesRxGain,
@@ -951,7 +951,7 @@ static void ar9003_rx_gain_table_mode2(struct ath_hw *ah) 
			       ar9462_2p0_baseband_core_mix_rxgain);

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_bb_postamble,

			       ar9462_2p0_baseband_postamble_mix_rxgain);

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,

			       ar9462_2p0_baseband_postamble_5g_xlna);

	}

}
@@ -961,12 +961,12 @@ static void ar9003_rx_gain_table_mode3(struct ath_hw *ah) 
	if (AR_SREV_9462_21(ah)) {

		INIT_INI_ARRAY(&ah->iniModesRxGain,

			       ar9462_2p1_common_5g_xlna_only_rxgain);

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,

			       ar9462_2p1_baseband_postamble_5g_xlna);

	} else if (AR_SREV_9462_20(ah)) {

		INIT_INI_ARRAY(&ah->iniModesRxGain,

			       ar9462_2p0_common_5g_xlna_only_rxgain);

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,

		INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,

			       ar9462_2p0_baseband_postamble_5g_xlna);

	}

}

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

+2 −2
Original line number Diff line number Diff line
@@ -926,12 +926,12 @@ static int ar9003_hw_process_ini(struct ath_hw *ah, 
		 */

		if ((ar9003_hw_get_rx_gain_idx(ah) == 2) ||

		    (ar9003_hw_get_rx_gain_idx(ah) == 3)) {

			REG_WRITE_ARRAY(&ah->ini_modes_rxgain_5g_xlna,

			REG_WRITE_ARRAY(&ah->ini_modes_rxgain_xlna,

					modesIndex, regWrites);

		}



		if (AR_SREV_9561(ah) && (ar9003_hw_get_rx_gain_idx(ah) == 0))

			REG_WRITE_ARRAY(&ah->ini_modes_rxgain_5g_xlna,

			REG_WRITE_ARRAY(&ah->ini_modes_rxgain_xlna,

					modesIndex, regWrites);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ struct ath_hw { 
	struct ar5416IniArray iniCckfirJapan2484;

	struct ar5416IniArray iniModes_9271_ANI_reg;

	struct ar5416IniArray ini_radio_post_sys2ant;

	struct ar5416IniArray ini_modes_rxgain_5g_xlna;

	struct ar5416IniArray ini_modes_rxgain_xlna;

	struct ar5416IniArray ini_modes_rxgain_bb_core;

	struct ar5416IniArray ini_modes_rxgain_bb_postamble;