Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 24 insertions, 13 deletions

diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index 60e55d8c510b..d494e98ba971 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -682,22 +682,16 @@ static struct ath_hw *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
                 ah->supp_cals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL;
         }
 
-        if (AR_SREV_9160(ah)) {
-                ah->config.enable_ani = 1;
-                ah->ani_function = (ATH9K_ANI_SPUR_IMMUNITY_LEVEL |
-                                        ATH9K_ANI_FIRSTEP_LEVEL);
-        } else {
-                ah->ani_function = ATH9K_ANI_ALL;
-                if (AR_SREV_9280_10_OR_LATER(ah)) {
-                        ah->ani_function &=     ~ATH9K_ANI_NOISE_IMMUNITY_LEVEL;
-                }
-        }
+        ah->ani_function = ATH9K_ANI_ALL;
+        if (AR_SREV_9280_10_OR_LATER(ah))
+                ah->ani_function &= ~ATH9K_ANI_NOISE_IMMUNITY_LEVEL;
 
         DPRINTF(sc, ATH_DBG_RESET,
                 "This Mac Chip Rev 0x%02x.%x is \n",
                 ah->hw_version.macVersion, ah->hw_version.macRev);
 
         if (AR_SREV_9285_12_OR_LATER(ah)) {
+
                 INIT_INI_ARRAY(&ah->iniModes, ar9285Modes_9285_1_2,
                                ARRAY_SIZE(ar9285Modes_9285_1_2), 6);
                 INIT_INI_ARRAY(&ah->iniCommon, ar9285Common_9285_1_2,
@@ -837,6 +831,22 @@ static struct ath_hw *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
         if (ecode != 0)
                 goto bad;
 
+        if (AR_SREV_9285_12_OR_LATER(ah)) {
+                u32 txgain_type = ah->eep_ops->get_eeprom(ah, EEP_TXGAIN_TYPE);
+
+                /* txgain table */
+                if (txgain_type == AR5416_EEP_TXGAIN_HIGH_POWER) {
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9285Modes_high_power_tx_gain_9285_1_2,
+                        ARRAY_SIZE(ar9285Modes_high_power_tx_gain_9285_1_2), 6);
+                } else {
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9285Modes_original_tx_gain_9285_1_2,
+                        ARRAY_SIZE(ar9285Modes_original_tx_gain_9285_1_2), 6);
+                }
+
+        }
+
         /* rxgain table */
         if (AR_SREV_9280_20(ah))
                 ath9k_hw_init_rxgain_ini(ah);
@@ -1173,7 +1183,7 @@ static void ath9k_hw_override_ini(struct ath_hw *ah,
         REG_SET_BIT(ah, AR_DIAG_SW, (AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT));
 
 
-        if (!AR_SREV_5416_V20_OR_LATER(ah) ||
+        if (!AR_SREV_5416_20_OR_LATER(ah) ||
             AR_SREV_9280_10_OR_LATER(ah))
                 return;
 
@@ -1275,7 +1285,7 @@ static int ath9k_hw_process_ini(struct ath_hw *ah,
         REG_WRITE(ah, AR_PHY_ADC_SERIAL_CTL, AR_PHY_SEL_EXTERNAL_RADIO);
         ah->eep_ops->set_addac(ah, chan);
 
-        if (AR_SREV_5416_V22_OR_LATER(ah)) {
+        if (AR_SREV_5416_22_OR_LATER(ah)) {
                 REG_WRITE_ARRAY(&ah->iniAddac, 1, regWrites);
         } else {
                 struct ar5416IniArray temp;
@@ -1313,7 +1323,8 @@ static int ath9k_hw_process_ini(struct ath_hw *ah,
         if (AR_SREV_9280(ah))
                 REG_WRITE_ARRAY(&ah->iniModesRxGain, modesIndex, regWrites);
 
-        if (AR_SREV_9280(ah))
+        if (AR_SREV_9280(ah) || (AR_SREV_9285(ah) &&
+            AR_SREV_9285_12_OR_LATER(ah)))
                 REG_WRITE_ARRAY(&ah->iniModesTxGain, modesIndex, regWrites);
 
         for (i = 0; i < ah->iniCommon.ia_rows; i++) {