1 files changed, 19 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index eb750a503999..cdc9d15e8419 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -678,6 +678,7 @@ static struct ath_hw *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
                 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,
@@ -817,6 +818,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);
@@ -1293,7 +1310,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++) {