diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2010-12-06 07:27:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-07 16:34:51 -0500 |
commit | ff48ba464e3503149657c60d46e8f4e9b4ed27fa (patch) | |
tree | fd4093a990bf04a14323e2f72abecfb40f708ce3 /drivers/net/wireless | |
parent | c88457eb83fb6db7a3286a685ecc6e33a7aac49d (diff) |
ath9k_hw: Initialize tx/rx gain table from initvals.h for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_hw.c | 82 |
1 files changed, 62 insertions, 20 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c index f01c2891f7c..21a5bfe354a 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c | |||
@@ -175,22 +175,52 @@ static void ar9003_tx_gain_table_apply(struct ath_hw *ah) | |||
175 | switch (ar9003_hw_get_tx_gain_idx(ah)) { | 175 | switch (ar9003_hw_get_tx_gain_idx(ah)) { |
176 | case 0: | 176 | case 0: |
177 | default: | 177 | default: |
178 | INIT_INI_ARRAY(&ah->iniModesTxGain, | 178 | if (AR_SREV_9485(ah)) |
179 | ar9300Modes_lowest_ob_db_tx_gain_table_2p2, | 179 | INIT_INI_ARRAY(&ah->iniModesTxGain, |
180 | ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p2), | 180 | ar9485Modes_lowest_ob_db_tx_gain_1_0, |
181 | 5); | 181 | ARRAY_SIZE(ar9485Modes_lowest_ob_db_tx_gain_1_0), |
182 | 5); | ||
183 | else | ||
184 | INIT_INI_ARRAY(&ah->iniModesTxGain, | ||
185 | ar9300Modes_lowest_ob_db_tx_gain_table_2p2, | ||
186 | ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p2), | ||
187 | 5); | ||
182 | break; | 188 | break; |
183 | case 1: | 189 | case 1: |
184 | INIT_INI_ARRAY(&ah->iniModesTxGain, | 190 | if (AR_SREV_9485(ah)) |
185 | ar9300Modes_high_ob_db_tx_gain_table_2p2, | 191 | INIT_INI_ARRAY(&ah->iniModesTxGain, |
186 | ARRAY_SIZE(ar9300Modes_high_ob_db_tx_gain_table_2p2), | 192 | ar9485Modes_high_ob_db_tx_gain_1_0, |
187 | 5); | 193 | ARRAY_SIZE(ar9485Modes_lowest_ob_db_tx_gain_1_0), |
194 | 5); | ||
195 | else | ||
196 | INIT_INI_ARRAY(&ah->iniModesTxGain, | ||
197 | ar9300Modes_high_ob_db_tx_gain_table_2p2, | ||
198 | ARRAY_SIZE(ar9300Modes_high_ob_db_tx_gain_table_2p2), | ||
199 | 5); | ||
188 | break; | 200 | break; |
189 | case 2: | 201 | case 2: |
190 | INIT_INI_ARRAY(&ah->iniModesTxGain, | 202 | if (AR_SREV_9485(ah)) |
191 | ar9300Modes_low_ob_db_tx_gain_table_2p2, | 203 | INIT_INI_ARRAY(&ah->iniModesTxGain, |
192 | ARRAY_SIZE(ar9300Modes_low_ob_db_tx_gain_table_2p2), | 204 | ar9485Modes_low_ob_db_tx_gain_1_0, |
193 | 5); | 205 | ARRAY_SIZE(ar9485Modes_lowest_ob_db_tx_gain_1_0), |
206 | 5); | ||
207 | else | ||
208 | INIT_INI_ARRAY(&ah->iniModesTxGain, | ||
209 | ar9300Modes_low_ob_db_tx_gain_table_2p2, | ||
210 | ARRAY_SIZE(ar9300Modes_low_ob_db_tx_gain_table_2p2), | ||
211 | 5); | ||
212 | break; | ||
213 | case 3: | ||
214 | if (AR_SREV_9485(ah)) | ||
215 | INIT_INI_ARRAY(&ah->iniModesTxGain, | ||
216 | ar9485Modes_high_power_tx_gain_1_0, | ||
217 | ARRAY_SIZE(ar9485Modes_high_power_tx_gain_1_0), | ||
218 | 5); | ||
219 | else | ||
220 | INIT_INI_ARRAY(&ah->iniModesTxGain, | ||
221 | ar9300Modes_high_power_tx_gain_table_2p2, | ||
222 | ARRAY_SIZE(ar9300Modes_high_power_tx_gain_table_2p2), | ||
223 | 5); | ||
194 | break; | 224 | break; |
195 | } | 225 | } |
196 | } | 226 | } |
@@ -200,16 +230,28 @@ static void ar9003_rx_gain_table_apply(struct ath_hw *ah) | |||
200 | switch (ar9003_hw_get_rx_gain_idx(ah)) { | 230 | switch (ar9003_hw_get_rx_gain_idx(ah)) { |
201 | case 0: | 231 | case 0: |
202 | default: | 232 | default: |
203 | INIT_INI_ARRAY(&ah->iniModesRxGain, | 233 | if (AR_SREV_9485(ah)) |
204 | ar9300Common_rx_gain_table_2p2, | 234 | INIT_INI_ARRAY(&ah->iniModesRxGain, |
205 | ARRAY_SIZE(ar9300Common_rx_gain_table_2p2), | 235 | ar9485Common_rx_gain_1_0, |
206 | 2); | 236 | ARRAY_SIZE(ar9485Common_rx_gain_1_0), |
237 | 2); | ||
238 | else | ||
239 | INIT_INI_ARRAY(&ah->iniModesRxGain, | ||
240 | ar9300Common_rx_gain_table_2p2, | ||
241 | ARRAY_SIZE(ar9300Common_rx_gain_table_2p2), | ||
242 | 2); | ||
207 | break; | 243 | break; |
208 | case 1: | 244 | case 1: |
209 | INIT_INI_ARRAY(&ah->iniModesRxGain, | 245 | if (AR_SREV_9485(ah)) |
210 | ar9300Common_wo_xlna_rx_gain_table_2p2, | 246 | INIT_INI_ARRAY(&ah->iniModesRxGain, |
211 | ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p2), | 247 | ar9485Common_wo_xlna_rx_gain_1_0, |
212 | 2); | 248 | ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_0), |
249 | 2); | ||
250 | else | ||
251 | INIT_INI_ARRAY(&ah->iniModesRxGain, | ||
252 | ar9300Common_wo_xlna_rx_gain_table_2p2, | ||
253 | ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p2), | ||
254 | 2); | ||
213 | break; | 255 | break; |
214 | } | 256 | } |
215 | } | 257 | } |