ath9k: merge initval and tx gain table updates, calibration fixes
authorFelix Fietkau <nbd@openwrt.org>
Sun, 8 Dec 2013 14:48:30 +0000 (14:48 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 8 Dec 2013 14:48:30 +0000 (14:48 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39001

package/kernel/mac80211/patches/300-pending_work.patch
package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
package/kernel/mac80211/patches/501-ath9k-eeprom_endianess.patch
package/kernel/mac80211/patches/502-ath9k_ahb_init.patch
package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch
package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
target/linux/generic/files/include/linux/ath9k_platform.h

index b3583a3..89a655c 100644 (file)
  obj-$(CPTCFG_ATH9K_HW) += ath9k_hw.o
 --- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-@@ -26,6 +26,7 @@
+@@ -17,6 +17,7 @@
+ #include "hw.h"
+ #include "ar9003_mac.h"
+ #include "ar9003_2p2_initvals.h"
++#include "ar9003_buffalo_initvals.h"
+ #include "ar9485_initvals.h"
+ #include "ar9340_initvals.h"
+ #include "ar9330_1p1_initvals.h"
+@@ -26,6 +27,7 @@
  #include "ar9462_2p0_initvals.h"
  #include "ar9462_2p1_initvals.h"
  #include "ar9565_1p0_initvals.h"
  
  /* General hardware code for the AR9003 hadware family */
  
-@@ -187,17 +188,17 @@ static void ar9003_hw_init_mode_regs(str
+@@ -148,7 +150,11 @@ static void ar9003_hw_init_mode_regs(str
+                               ar9340Modes_high_ob_db_tx_gain_table_1p0);
+               INIT_INI_ARRAY(&ah->iniModesFastClock,
+-                              ar9340Modes_fast_clock_1p0);
++                             ar9340Modes_fast_clock_1p0);
++              INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
++                             ar9340_1p0_baseband_core_txfir_coeff_japan_2484);
++              INIT_INI_ARRAY(&ah->ini_dfs,
++                             ar9340_1p0_baseband_postamble_dfs_channel);
+               if (!ah->is_clk_25mhz)
+                       INIT_INI_ARRAY(&ah->iniAdditional,
+@@ -187,17 +193,17 @@ static void ar9003_hw_init_mode_regs(str
                INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
                               ar9485_1_1_baseband_core_txfir_coeff_japan_2484);
  
        } else if (AR_SREV_9462_21(ah)) {
                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
                               ar9462_2p1_mac_core);
-@@ -223,6 +224,10 @@ static void ar9003_hw_init_mode_regs(str
+@@ -223,6 +229,10 @@ static void ar9003_hw_init_mode_regs(str
                               ar9462_2p1_modes_fast_clock);
                INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
                               ar9462_2p1_baseband_core_txfir_coeff_japan_2484);
        } else if (AR_SREV_9462_20(ah)) {
  
                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE], ar9462_2p0_mac_core);
-@@ -247,18 +252,18 @@ static void ar9003_hw_init_mode_regs(str
+@@ -247,18 +257,18 @@ static void ar9003_hw_init_mode_regs(str
                                ar9462_2p0_soc_postamble);
  
                INIT_INI_ARRAY(&ah->iniModesRxGain,
  
                INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
                               ar9462_2p0_baseband_core_txfir_coeff_japan_2484);
-@@ -331,6 +336,41 @@ static void ar9003_hw_init_mode_regs(str
+@@ -330,7 +340,46 @@ static void ar9003_hw_init_mode_regs(str
+                               ar9580_1p0_low_ob_db_tx_gain_table);
  
                INIT_INI_ARRAY(&ah->iniModesFastClock,
-                               ar9580_1p0_modes_fast_clock);
+-                              ar9580_1p0_modes_fast_clock);
++                             ar9580_1p0_modes_fast_clock);
++              INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
++                             ar9580_1p0_baseband_core_txfir_coeff_japan_2484);
++              INIT_INI_ARRAY(&ah->ini_dfs,
++                             ar9580_1p0_baseband_postamble_dfs_channel);
 +      } else if (AR_SREV_9565_11_OR_LATER(ah)) {
 +              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
 +                             ar9565_1p1_mac_core);
        } else if (AR_SREV_9565(ah)) {
                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
                               ar9565_1p0_mac_core);
-@@ -440,7 +480,10 @@ static void ar9003_tx_gain_table_mode0(s
+@@ -411,7 +460,11 @@ static void ar9003_hw_init_mode_regs(str
+               /* Fast clock modal settings */
+               INIT_INI_ARRAY(&ah->iniModesFastClock,
+-                              ar9300Modes_fast_clock_2p2);
++                             ar9300Modes_fast_clock_2p2);
++              INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
++                             ar9300_2p2_baseband_core_txfir_coeff_japan_2484);
++              INIT_INI_ARRAY(&ah->ini_dfs,
++                             ar9300_2p2_baseband_postamble_dfs_channel);
+       }
+ }
+@@ -440,7 +493,10 @@ static void ar9003_tx_gain_table_mode0(s
                        ar9462_2p1_modes_low_ob_db_tx_gain);
        else if (AR_SREV_9462_20(ah))
                INIT_INI_ARRAY(&ah->iniModesTxGain,
        else if (AR_SREV_9565(ah))
                INIT_INI_ARRAY(&ah->iniModesTxGain,
                               ar9565_1p0_modes_low_ob_db_tx_gain_table);
-@@ -474,7 +517,10 @@ static void ar9003_tx_gain_table_mode1(s
+@@ -474,7 +530,10 @@ static void ar9003_tx_gain_table_mode1(s
                        ar9462_2p1_modes_high_ob_db_tx_gain);
        else if (AR_SREV_9462_20(ah))
                INIT_INI_ARRAY(&ah->iniModesTxGain,
        else if (AR_SREV_9565(ah))
                INIT_INI_ARRAY(&ah->iniModesTxGain,
                               ar9565_1p0_modes_high_ob_db_tx_gain_table);
-@@ -500,6 +546,9 @@ static void ar9003_tx_gain_table_mode2(s
+@@ -500,6 +559,9 @@ static void ar9003_tx_gain_table_mode2(s
        else if (AR_SREV_9580(ah))
                INIT_INI_ARRAY(&ah->iniModesTxGain,
                        ar9580_1p0_low_ob_db_tx_gain_table);
        else if (AR_SREV_9565(ah))
                INIT_INI_ARRAY(&ah->iniModesTxGain,
                               ar9565_1p0_modes_low_ob_db_tx_gain_table);
-@@ -525,6 +574,9 @@ static void ar9003_tx_gain_table_mode3(s
+@@ -525,12 +587,20 @@ static void ar9003_tx_gain_table_mode3(s
        else if (AR_SREV_9580(ah))
                INIT_INI_ARRAY(&ah->iniModesTxGain,
                        ar9580_1p0_high_power_tx_gain_table);
        else if (AR_SREV_9565(ah))
                INIT_INI_ARRAY(&ah->iniModesTxGain,
                               ar9565_1p0_modes_high_power_tx_gain_table);
-@@ -546,7 +598,7 @@ static void ar9003_tx_gain_table_mode4(s
+-      else
+-              INIT_INI_ARRAY(&ah->iniModesTxGain,
+-                      ar9300Modes_high_power_tx_gain_table_2p2);
++      else {
++              if (ah->config.tx_gain_buffalo)
++                      INIT_INI_ARRAY(&ah->iniModesTxGain,
++                                     ar9300Modes_high_power_tx_gain_table_buffalo);
++              else
++                      INIT_INI_ARRAY(&ah->iniModesTxGain,
++                                     ar9300Modes_high_power_tx_gain_table_2p2);
++      }
+ }
+ static void ar9003_tx_gain_table_mode4(struct ath_hw *ah)
+@@ -546,7 +616,7 @@ static void ar9003_tx_gain_table_mode4(s
                       ar9462_2p1_modes_mix_ob_db_tx_gain);
        else if (AR_SREV_9462_20(ah))
                INIT_INI_ARRAY(&ah->iniModesTxGain,
        else
                INIT_INI_ARRAY(&ah->iniModesTxGain,
                        ar9300Modes_mixed_ob_db_tx_gain_table_2p2);
-@@ -581,6 +633,13 @@ static void ar9003_tx_gain_table_mode6(s
+@@ -581,6 +651,13 @@ static void ar9003_tx_gain_table_mode6(s
                        ar9580_1p0_type6_tx_gain_table);
  }
  
  typedef void (*ath_txgain_tab)(struct ath_hw *ah);
  
  static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
-@@ -593,6 +652,7 @@ static void ar9003_tx_gain_table_apply(s
+@@ -593,6 +670,7 @@ static void ar9003_tx_gain_table_apply(s
                ar9003_tx_gain_table_mode4,
                ar9003_tx_gain_table_mode5,
                ar9003_tx_gain_table_mode6,
        };
        int idx = ar9003_hw_get_tx_gain_idx(ah);
  
-@@ -629,7 +689,10 @@ static void ar9003_rx_gain_table_mode0(s
+@@ -629,7 +707,10 @@ static void ar9003_rx_gain_table_mode0(s
                                ar9462_2p1_common_rx_gain);
        else if (AR_SREV_9462_20(ah))
                INIT_INI_ARRAY(&ah->iniModesRxGain,
        else if (AR_SREV_9565(ah))
                INIT_INI_ARRAY(&ah->iniModesRxGain,
                               ar9565_1p0_Common_rx_gain_table);
-@@ -657,7 +720,7 @@ static void ar9003_rx_gain_table_mode1(s
+@@ -657,7 +738,7 @@ static void ar9003_rx_gain_table_mode1(s
                        ar9462_2p1_common_wo_xlna_rx_gain);
        else if (AR_SREV_9462_20(ah))
                INIT_INI_ARRAY(&ah->iniModesRxGain,
        else if (AR_SREV_9550(ah)) {
                INIT_INI_ARRAY(&ah->iniModesRxGain,
                        ar955x_1p0_common_wo_xlna_rx_gain_table);
-@@ -666,6 +729,9 @@ static void ar9003_rx_gain_table_mode1(s
+@@ -666,6 +747,9 @@ static void ar9003_rx_gain_table_mode1(s
        } else if (AR_SREV_9580(ah))
                INIT_INI_ARRAY(&ah->iniModesRxGain,
                        ar9580_1p0_wo_xlna_rx_gain_table);
        else if (AR_SREV_9565(ah))
                INIT_INI_ARRAY(&ah->iniModesRxGain,
                               ar9565_1p0_common_wo_xlna_rx_gain_table);
-@@ -687,7 +753,7 @@ static void ar9003_rx_gain_table_mode2(s
+@@ -687,7 +771,7 @@ static void ar9003_rx_gain_table_mode2(s
                               ar9462_2p1_baseband_postamble_5g_xlna);
        } else if (AR_SREV_9462_20(ah)) {
                INIT_INI_ARRAY(&ah->iniModesRxGain,
                INIT_INI_ARRAY(&ah->ini_modes_rxgain_bb_core,
                               ar9462_2p0_baseband_core_mix_rxgain);
                INIT_INI_ARRAY(&ah->ini_modes_rxgain_bb_postamble,
-@@ -701,12 +767,12 @@ static void ar9003_rx_gain_table_mode3(s
+@@ -701,12 +785,12 @@ static void ar9003_rx_gain_table_mode3(s
  {
        if (AR_SREV_9462_21(ah)) {
                INIT_INI_ARRAY(&ah->iniModesRxGain,
                INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,
                               ar9462_2p0_baseband_postamble_5g_xlna);
        }
-@@ -750,6 +816,9 @@ static void ar9003_hw_init_mode_gain_reg
+@@ -750,6 +834,9 @@ static void ar9003_hw_init_mode_gain_reg
  static void ar9003_hw_configpcipowersave(struct ath_hw *ah,
                                         bool power_off)
  {
        /*
         * Increase L1 Entry Latency. Some WB222 boards don't have
         * this change in eeprom/OTP.
-@@ -775,18 +844,13 @@ static void ar9003_hw_configpcipowersave
+@@ -775,18 +862,13 @@ static void ar9003_hw_configpcipowersave
         * Configire PCIE after Ini init. SERDES values now come from ini file
         * This enables PCIe low power mode.
         */
  
 --- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
 +++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
-@@ -1447,4 +1447,106 @@ static const u32 ar9340_1p0_soc_preamble
-       {0x00007038, 0x000004c2},
- };
+@@ -18,6 +18,20 @@
+ #ifndef INITVALS_9340_H
+ #define INITVALS_9340_H
  
-+static const u32 ar9340_cus227_tx_gain_table_1p0[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-+      {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-+      {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-+      {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-+      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-+      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-+      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-+      {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
-+      {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
-+      {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
-+      {0x0000a520, 0x2c022220, 0x2c022220, 0x1b000603, 0x1b000603},
-+      {0x0000a524, 0x30022222, 0x30022222, 0x1f000a02, 0x1f000a02},
-+      {0x0000a528, 0x35022225, 0x35022225, 0x23000a04, 0x23000a04},
-+      {0x0000a52c, 0x3b02222a, 0x3b02222a, 0x26000a20, 0x26000a20},
-+      {0x0000a530, 0x3f02222c, 0x3f02222c, 0x2a000e20, 0x2a000e20},
-+      {0x0000a534, 0x4202242a, 0x4202242a, 0x2e000e22, 0x2e000e22},
-+      {0x0000a538, 0x4702244a, 0x4702244a, 0x31000e24, 0x31000e24},
-+      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x34001640, 0x34001640},
-+      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
-+      {0x0000a544, 0x5302266c, 0x5302266c, 0x3b001861, 0x3b001861},
-+      {0x0000a548, 0x5702286c, 0x5702286c, 0x3e001a81, 0x3e001a81},
-+      {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42001a83, 0x42001a83},
-+      {0x0000a550, 0x61024a6c, 0x61024a6c, 0x44001c84, 0x44001c84},
-+      {0x0000a554, 0x66026a6c, 0x66026a6c, 0x48001ce3, 0x48001ce3},
-+      {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c001ce5, 0x4c001ce5},
-+      {0x0000a55c, 0x7002708c, 0x7002708c, 0x50001ce9, 0x50001ce9},
-+      {0x0000a560, 0x7302b08a, 0x7302b08a, 0x54001ceb, 0x54001ceb},
-+      {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+      {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+      {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+      {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+      {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+      {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+      {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+      {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+      {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
-+      {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
-+      {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-+      {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-+      {0x0000a594, 0x1c800223, 0x1c800223, 0x11800400, 0x11800400},
-+      {0x0000a598, 0x21820220, 0x21820220, 0x15800402, 0x15800402},
-+      {0x0000a59c, 0x27820223, 0x27820223, 0x19800404, 0x19800404},
-+      {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800603, 0x1b800603},
-+      {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800a02, 0x1f800a02},
-+      {0x0000a5a8, 0x34822225, 0x34822225, 0x23800a04, 0x23800a04},
-+      {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x26800a20, 0x26800a20},
-+      {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2a800e20, 0x2a800e20},
-+      {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2e800e22, 0x2e800e22},
-+      {0x0000a5b8, 0x4782244a, 0x4782244a, 0x31800e24, 0x31800e24},
-+      {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x34801640, 0x34801640},
-+      {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38801660, 0x38801660},
-+      {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b801861, 0x3b801861},
-+      {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e801a81, 0x3e801a81},
-+      {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42801a83, 0x42801a83},
-+      {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x44801c84, 0x44801c84},
-+      {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x48801ce3, 0x48801ce3},
-+      {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c801ce5, 0x4c801ce5},
-+      {0x0000a5dc, 0x7086308c, 0x7086308c, 0x50801ce9, 0x50801ce9},
-+      {0x0000a5e0, 0x738a308a, 0x738a308a, 0x54801ceb, 0x54801ceb},
-+      {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+      {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+      {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+      {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+      {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+      {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+      {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+      {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-+      {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
-+      {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
-+      {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
-+      {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
-+      {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
-+      {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
-+      {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-+      {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-+      {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-+      {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-+      {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-+      {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-+      {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-+      {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+      {0x00016044, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
-+      {0x00016048, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
-+      {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
-+      {0x00016288, 0x30318000, 0x30318000, 0x00318000, 0x00318000},
-+      {0x00016444, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
-+      {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
-+      {0x0000a3a4, 0x00000011, 0x00000011, 0x00000011, 0x00000011},
-+      {0x0000a3a8, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c},
-+      {0x0000a3ac, 0x30303030, 0x30303030, 0x30303030, 0x30303030},
-+};
++#define ar9340_1p0_mac_postamble ar9300_2p2_mac_postamble
 +
- #endif /* INITVALS_9340_H */
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -459,6 +459,7 @@ void ath_check_ani(struct ath_softc *sc)
- int ath_update_survey_stats(struct ath_softc *sc);
- void ath_update_survey_nf(struct ath_softc *sc, int channel);
- void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
-+void ath_ps_full_sleep(unsigned long data);
- /**********/
- /* BTCOEX */
-@@ -570,6 +571,34 @@ static inline void ath_fill_led_pin(stru
- }
- #endif
-+/************************/
-+/* Wake on Wireless LAN */
-+/************************/
++#define ar9340_1p0_soc_postamble ar9300_2p2_soc_postamble
 +
-+#ifdef CONFIG_ATH9K_WOW
-+void ath9k_init_wow(struct ieee80211_hw *hw);
-+int ath9k_suspend(struct ieee80211_hw *hw,
-+                struct cfg80211_wowlan *wowlan);
-+int ath9k_resume(struct ieee80211_hw *hw);
-+void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled);
-+#else
-+static inline void ath9k_init_wow(struct ieee80211_hw *hw)
-+{
-+}
-+static inline int ath9k_suspend(struct ieee80211_hw *hw,
-+                              struct cfg80211_wowlan *wowlan)
-+{
-+      return 0;
-+}
-+static inline int ath9k_resume(struct ieee80211_hw *hw)
-+{
-+      return 0;
-+}
-+static inline void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
-+{
-+}
-+#endif /* CONFIG_ATH9K_WOW */
++#define ar9340Modes_fast_clock_1p0 ar9300Modes_fast_clock_2p2
 +
- /*******************************/
- /* Antenna diversity/combining */
- /*******************************/
-@@ -632,15 +661,16 @@ void ath_ant_comb_scan(struct ath_softc 
- /* Main driver core */
- /********************/
--#define ATH9K_PCI_CUS198      0x0001
--#define ATH9K_PCI_CUS230      0x0002
--#define ATH9K_PCI_CUS217      0x0004
--#define ATH9K_PCI_CUS252      0x0008
--#define ATH9K_PCI_WOW         0x0010
--#define ATH9K_PCI_BT_ANT_DIV  0x0020
--#define ATH9K_PCI_D3_L1_WAR   0x0040
--#define ATH9K_PCI_AR9565_1ANT 0x0080
--#define ATH9K_PCI_AR9565_2ANT 0x0100
-+#define ATH9K_PCI_CUS198          0x0001
-+#define ATH9K_PCI_CUS230          0x0002
-+#define ATH9K_PCI_CUS217          0x0004
-+#define ATH9K_PCI_CUS252          0x0008
-+#define ATH9K_PCI_WOW             0x0010
-+#define ATH9K_PCI_BT_ANT_DIV      0x0020
-+#define ATH9K_PCI_D3_L1_WAR       0x0040
-+#define ATH9K_PCI_AR9565_1ANT     0x0080
-+#define ATH9K_PCI_AR9565_2ANT     0x0100
-+#define ATH9K_PCI_NO_PLL_PWRSAVE  0x0200
- /*
-  * Default cache line size, in bytes.
-@@ -723,6 +753,7 @@ struct ath_softc {
-       struct work_struct hw_check_work;
-       struct work_struct hw_reset_work;
-       struct completion paprd_complete;
-+      wait_queue_head_t tx_wait;
-       unsigned int hw_busy_count;
-       unsigned long sc_flags;
-@@ -759,6 +790,7 @@ struct ath_softc {
-       struct delayed_work tx_complete_work;
-       struct delayed_work hw_pll_work;
-       struct timer_list rx_poll_timer;
-+      struct timer_list sleep_timer;
- #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
-       struct ath_btcoex btcoex;
-@@ -783,7 +815,7 @@ struct ath_softc {
-       bool tx99_state;
-       s16 tx99_power;
--#ifdef CONFIG_PM_SLEEP
-+#ifdef CONFIG_ATH9K_WOW
-       atomic_t wow_got_bmiss_intr;
-       atomic_t wow_sleep_proc_intr; /* in the middle of WoW sleep ? */
-       u32 wow_intr_before_sleep;
-@@ -946,10 +978,25 @@ struct fft_sample_ht20_40 {
-       u8 data[SPECTRAL_HT20_40_NUM_BINS];
- } __packed;
--int ath9k_tx99_init(struct ath_softc *sc);
--void ath9k_tx99_deinit(struct ath_softc *sc);
-+/********/
-+/* TX99 */
-+/********/
++#define ar9340Common_rx_gain_table_1p0 ar9300Common_rx_gain_table_2p2
 +
-+#ifdef CONFIG_ATH9K_TX99
-+void ath9k_tx99_init_debug(struct ath_softc *sc);
- int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,
-                   struct ath_tx_control *txctl);
-+#else
-+static inline void ath9k_tx99_init_debug(struct ath_softc *sc)
-+{
-+}
-+static inline int ath9k_tx99_send(struct ath_softc *sc,
-+                                struct sk_buff *skb,
-+                                struct ath_tx_control *txctl)
-+{
-+      return 0;
-+}
-+#endif /* CONFIG_ATH9K_TX99 */
++#define ar9340Common_wo_xlna_rx_gain_table_1p0 ar9300Common_wo_xlna_rx_gain_table_2p2
++
++#define ar9340_1p0_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484
++
++#define ar9340_1p0_baseband_postamble_dfs_channel ar9300_2p2_baseband_postamble_dfs_channel
++
+ static const u32 ar9340_1p0_radio_postamble[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x000160ac, 0xa4646800, 0xa4646800, 0xa4646800, 0xa4646800},
+@@ -100,8 +114,6 @@ static const u32 ar9340Modes_lowest_ob_d
+       {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
+ };
  
- void ath9k_tasklet(unsigned long data);
- int ath_cabq_update(struct ath_softc *);
-@@ -966,6 +1013,9 @@ extern bool is_ath9k_unloaded;
+-#define ar9340Modes_fast_clock_1p0 ar9300Modes_fast_clock_2p2
+-
+ static const u32 ar9340_1p0_radio_core[][2] = {
+       /* Addr      allmodes  */
+       {0x00016000, 0x36db6db6},
+@@ -215,16 +227,12 @@ static const u32 ar9340_1p0_radio_core_4
+       {0x0000824c, 0x0001e800},
+ };
  
- u8 ath9k_parse_mpdudensity(u8 mpdudensity);
- irqreturn_t ath_isr(int irq, void *dev);
-+int ath_reset(struct ath_softc *sc);
-+void ath_cancel_work(struct ath_softc *sc);
-+void ath_restart_work(struct ath_softc *sc);
- int ath9k_init_device(u16 devid, struct ath_softc *sc,
-                   const struct ath_bus_ops *bus_ops);
- void ath9k_deinit_device(struct ath_softc *sc);
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1782,111 +1782,6 @@ void ath9k_deinit_debug(struct ath_softc
-       }
- }
--static ssize_t read_file_tx99(struct file *file, char __user *user_buf,
--                            size_t count, loff_t *ppos)
--{
--      struct ath_softc *sc = file->private_data;
--      char buf[3];
--      unsigned int len;
--
--      len = sprintf(buf, "%d\n", sc->tx99_state);
--      return simple_read_from_buffer(user_buf, count, ppos, buf, len);
--}
--
--static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,
--                             size_t count, loff_t *ppos)
--{
--      struct ath_softc *sc = file->private_data;
--      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
--      char buf[32];
--      bool start;
--      ssize_t len;
--      int r;
--
--      if (sc->nvifs > 1)
--              return -EOPNOTSUPP;
--
--      len = min(count, sizeof(buf) - 1);
--      if (copy_from_user(buf, user_buf, len))
--              return -EFAULT;
--
--      if (strtobool(buf, &start))
--              return -EINVAL;
--
--      if (start == sc->tx99_state) {
--              if (!start)
--                      return count;
--              ath_dbg(common, XMIT, "Resetting TX99\n");
--              ath9k_tx99_deinit(sc);
--      }
--
--      if (!start) {
--              ath9k_tx99_deinit(sc);
--              return count;
--      }
--
--      r = ath9k_tx99_init(sc);
--      if (r)
--              return r;
--
--      return count;
--}
--
--static const struct file_operations fops_tx99 = {
--      .read = read_file_tx99,
--      .write = write_file_tx99,
--      .open = simple_open,
--      .owner = THIS_MODULE,
--      .llseek = default_llseek,
--};
--
--static ssize_t read_file_tx99_power(struct file *file,
--                                  char __user *user_buf,
--                                  size_t count, loff_t *ppos)
--{
--      struct ath_softc *sc = file->private_data;
--      char buf[32];
--      unsigned int len;
--
--      len = sprintf(buf, "%d (%d dBm)\n",
--                    sc->tx99_power,
--                    sc->tx99_power / 2);
--
--      return simple_read_from_buffer(user_buf, count, ppos, buf, len);
--}
--
--static ssize_t write_file_tx99_power(struct file *file,
--                                   const char __user *user_buf,
--                                   size_t count, loff_t *ppos)
--{
--      struct ath_softc *sc = file->private_data;
--      int r;
--      u8 tx_power;
--
--      r = kstrtou8_from_user(user_buf, count, 0, &tx_power);
--      if (r)
--              return r;
--
--      if (tx_power > MAX_RATE_POWER)
--              return -EINVAL;
--
--      sc->tx99_power = tx_power;
--
--      ath9k_ps_wakeup(sc);
--      ath9k_hw_tx99_set_txpower(sc->sc_ah, sc->tx99_power);
--      ath9k_ps_restore(sc);
--
--      return count;
--}
+-#define ar9340_1p0_mac_postamble ar9300_2p2_mac_postamble
 -
--static const struct file_operations fops_tx99_power = {
--      .read = read_file_tx99_power,
--      .write = write_file_tx99_power,
--      .open = simple_open,
--      .owner = THIS_MODULE,
--      .llseek = default_llseek,
--};
+-#define ar9340_1p0_soc_postamble ar9300_2p2_soc_postamble
 -
- int ath9k_init_debug(struct ath_hw *ah)
- {
-       struct ath_common *common = ath9k_hw_common(ah);
-@@ -1903,6 +1798,7 @@ int ath9k_init_debug(struct ath_hw *ah)
- #endif
-       ath9k_dfs_init_debug(sc);
-+      ath9k_tx99_init_debug(sc);
-       debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
-                           &fops_dma);
-@@ -1978,15 +1874,6 @@ int ath9k_init_debug(struct ath_hw *ah)
-       debugfs_create_file("btcoex", S_IRUSR, sc->debug.debugfs_phy, sc,
-                           &fops_btcoex);
- #endif
--      if (config_enabled(CPTCFG_ATH9K_TX99) &&
--          AR_SREV_9300_20_OR_LATER(ah)) {
--              debugfs_create_file("tx99", S_IRUSR | S_IWUSR,
--                                  sc->debug.debugfs_phy, sc,
--                                  &fops_tx99);
--              debugfs_create_file("tx99_power", S_IRUSR | S_IWUSR,
--                                  sc->debug.debugfs_phy, sc,
--                                  &fops_tx99_power);
--      }
-       return 0;
- }
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -17,6 +17,7 @@
- #include <linux/io.h>
- #include <linux/slab.h>
- #include <linux/module.h>
-+#include <linux/time.h>
- #include <asm/unaligned.h>
- #include "hw.h"
-@@ -454,7 +455,6 @@ static void ath9k_hw_init_config(struct 
-       }
-       ah->config.rx_intr_mitigation = true;
--      ah->config.pcieSerDesWrite = true;
-       /*
-        * We need this for PCI devices only (Cardbus, PCI, miniPCI)
-@@ -1502,8 +1502,9 @@ static bool ath9k_hw_channel_change(stru
-       int r;
-       if (pCap->hw_caps & ATH9K_HW_CAP_FCC_BAND_SWITCH) {
--              band_switch = IS_CHAN_5GHZ(ah->curchan) != IS_CHAN_5GHZ(chan);
--              mode_diff = (chan->channelFlags != ah->curchan->channelFlags);
-+              u32 flags_diff = chan->channelFlags ^ ah->curchan->channelFlags;
-+              band_switch = !!(flags_diff & CHANNEL_5GHZ);
-+              mode_diff = !!(flags_diff & ~CHANNEL_HT);
-       }
-       for (qnum = 0; qnum < AR_NUM_QCU; qnum++) {
-@@ -1815,7 +1816,7 @@ static int ath9k_hw_do_fastcc(struct ath
-        * If cross-band fcc is not supoprted, bail out if channelFlags differ.
-        */
-       if (!(pCap->hw_caps & ATH9K_HW_CAP_FCC_BAND_SWITCH) &&
--          chan->channelFlags != ah->curchan->channelFlags)
-+          ((chan->channelFlags ^ ah->curchan->channelFlags) & ~CHANNEL_HT))
-               goto fail;
-       if (!ath9k_hw_check_alive(ah))
-@@ -1856,10 +1857,12 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-                  struct ath9k_hw_cal_data *caldata, bool fastcc)
- {
-       struct ath_common *common = ath9k_hw_common(ah);
-+      struct timespec ts;
-       u32 saveLedState;
-       u32 saveDefAntenna;
-       u32 macStaId1;
-       u64 tsf = 0;
-+      s64 usec = 0;
-       int r;
-       bool start_mci_reset = false;
-       bool save_fullsleep = ah->chip_fullsleep;
-@@ -1902,10 +1905,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-       macStaId1 = REG_READ(ah, AR_STA_ID1) & AR_STA_ID1_BASE_RATE_11B;
--      /* For chips on which RTC reset is done, save TSF before it gets cleared */
--      if (AR_SREV_9100(ah) ||
--          (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)))
--              tsf = ath9k_hw_gettsf64(ah);
-+      /* Save TSF before chip reset, a cold reset clears it */
-+      tsf = ath9k_hw_gettsf64(ah);
-+      getrawmonotonic(&ts);
-+      usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000;
-       saveLedState = REG_READ(ah, AR_CFG_LED) &
-               (AR_CFG_LED_ASSOC_CTL | AR_CFG_LED_MODE_SEL |
-@@ -1938,8 +1941,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-       }
-       /* Restore TSF */
--      if (tsf)
--              ath9k_hw_settsf64(ah, tsf);
-+      getrawmonotonic(&ts);
-+      usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000 - usec;
-+      ath9k_hw_settsf64(ah, tsf + usec);
-       if (AR_SREV_9280_20_OR_LATER(ah))
-               REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -283,7 +283,6 @@ struct ath9k_ops_config {
-       int additional_swba_backoff;
-       int ack_6mb;
-       u32 cwm_ignore_extcca;
--      bool pcieSerDesWrite;
-       u8 pcie_clock_req;
-       u32 pcie_waen;
-       u8 analog_shiftreg;
-@@ -316,6 +315,7 @@ struct ath9k_ops_config {
-       u32 ant_ctrl_comm2g_switch_enable;
-       bool xatten_margin_cfg;
-       bool alt_mingainidx;
-+      bool no_pll_pwrsave;
+ static const u32 ar9340_1p0_baseband_postamble[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
+       {0x00009820, 0x206a022e, 0x206a022e, 0x206a022e, 0x206a022e},
+       {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+-      {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
++      {0x00009828, 0x06903081, 0x06903081, 0x09103881, 0x09103881},
+       {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+       {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
+       {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
+@@ -340,9 +348,9 @@ static const u32 ar9340_1p0_baseband_cor
+       {0x0000a370, 0x00000000},
+       {0x0000a390, 0x00000001},
+       {0x0000a394, 0x00000444},
+-      {0x0000a398, 0x001f0e0f},
+-      {0x0000a39c, 0x0075393f},
+-      {0x0000a3a0, 0xb79f6427},
++      {0x0000a398, 0x00000000},
++      {0x0000a39c, 0x210d0401},
++      {0x0000a3a0, 0xab9a7144},
+       {0x0000a3a4, 0x00000000},
+       {0x0000a3a8, 0xaaaaaaaa},
+       {0x0000a3ac, 0x3c466478},
+@@ -714,266 +722,6 @@ static const u32 ar9340Modes_ub124_tx_ga
+       {0x0000b2e8, 0xfffe0000, 0xfffe0000, 0xfffc0000, 0xfffc0000},
  };
  
- enum ath9k_int {
-@@ -920,7 +920,7 @@ struct ath_hw {
-       /* Enterprise mode cap */
-       u32 ent_mode;
--#ifdef CONFIG_PM_SLEEP
-+#ifdef CONFIG_ATH9K_WOW
-       u32 wow_event_mask;
- #endif
-       bool is_clk_25mhz;
-@@ -1126,7 +1126,7 @@ ath9k_hw_get_btcoex_scheme(struct ath_hw
- #endif /* CPTCFG_ATH9K_BTCOEX_SUPPORT */
--#ifdef CONFIG_PM_SLEEP
-+#ifdef CONFIG_ATH9K_WOW
- const char *ath9k_hw_wow_event_to_string(u32 wow_event);
- void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
-                               u8 *user_mask, int pattern_count,
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
+-static const u32 ar9340Common_rx_gain_table_1p0[][2] = {
+-      /* Addr      allmodes  */
+-      {0x0000a000, 0x00010000},
+-      {0x0000a004, 0x00030002},
+-      {0x0000a008, 0x00050004},
+-      {0x0000a00c, 0x00810080},
+-      {0x0000a010, 0x00830082},
+-      {0x0000a014, 0x01810180},
+-      {0x0000a018, 0x01830182},
+-      {0x0000a01c, 0x01850184},
+-      {0x0000a020, 0x01890188},
+-      {0x0000a024, 0x018b018a},
+-      {0x0000a028, 0x018d018c},
+-      {0x0000a02c, 0x01910190},
+-      {0x0000a030, 0x01930192},
+-      {0x0000a034, 0x01950194},
+-      {0x0000a038, 0x038a0196},
+-      {0x0000a03c, 0x038c038b},
+-      {0x0000a040, 0x0390038d},
+-      {0x0000a044, 0x03920391},
+-      {0x0000a048, 0x03940393},
+-      {0x0000a04c, 0x03960395},
+-      {0x0000a050, 0x00000000},
+-      {0x0000a054, 0x00000000},
+-      {0x0000a058, 0x00000000},
+-      {0x0000a05c, 0x00000000},
+-      {0x0000a060, 0x00000000},
+-      {0x0000a064, 0x00000000},
+-      {0x0000a068, 0x00000000},
+-      {0x0000a06c, 0x00000000},
+-      {0x0000a070, 0x00000000},
+-      {0x0000a074, 0x00000000},
+-      {0x0000a078, 0x00000000},
+-      {0x0000a07c, 0x00000000},
+-      {0x0000a080, 0x22222229},
+-      {0x0000a084, 0x1d1d1d1d},
+-      {0x0000a088, 0x1d1d1d1d},
+-      {0x0000a08c, 0x1d1d1d1d},
+-      {0x0000a090, 0x171d1d1d},
+-      {0x0000a094, 0x11111717},
+-      {0x0000a098, 0x00030311},
+-      {0x0000a09c, 0x00000000},
+-      {0x0000a0a0, 0x00000000},
+-      {0x0000a0a4, 0x00000000},
+-      {0x0000a0a8, 0x00000000},
+-      {0x0000a0ac, 0x00000000},
+-      {0x0000a0b0, 0x00000000},
+-      {0x0000a0b4, 0x00000000},
+-      {0x0000a0b8, 0x00000000},
+-      {0x0000a0bc, 0x00000000},
+-      {0x0000a0c0, 0x001f0000},
+-      {0x0000a0c4, 0x01000101},
+-      {0x0000a0c8, 0x011e011f},
+-      {0x0000a0cc, 0x011c011d},
+-      {0x0000a0d0, 0x02030204},
+-      {0x0000a0d4, 0x02010202},
+-      {0x0000a0d8, 0x021f0200},
+-      {0x0000a0dc, 0x0302021e},
+-      {0x0000a0e0, 0x03000301},
+-      {0x0000a0e4, 0x031e031f},
+-      {0x0000a0e8, 0x0402031d},
+-      {0x0000a0ec, 0x04000401},
+-      {0x0000a0f0, 0x041e041f},
+-      {0x0000a0f4, 0x0502041d},
+-      {0x0000a0f8, 0x05000501},
+-      {0x0000a0fc, 0x051e051f},
+-      {0x0000a100, 0x06010602},
+-      {0x0000a104, 0x061f0600},
+-      {0x0000a108, 0x061d061e},
+-      {0x0000a10c, 0x07020703},
+-      {0x0000a110, 0x07000701},
+-      {0x0000a114, 0x00000000},
+-      {0x0000a118, 0x00000000},
+-      {0x0000a11c, 0x00000000},
+-      {0x0000a120, 0x00000000},
+-      {0x0000a124, 0x00000000},
+-      {0x0000a128, 0x00000000},
+-      {0x0000a12c, 0x00000000},
+-      {0x0000a130, 0x00000000},
+-      {0x0000a134, 0x00000000},
+-      {0x0000a138, 0x00000000},
+-      {0x0000a13c, 0x00000000},
+-      {0x0000a140, 0x001f0000},
+-      {0x0000a144, 0x01000101},
+-      {0x0000a148, 0x011e011f},
+-      {0x0000a14c, 0x011c011d},
+-      {0x0000a150, 0x02030204},
+-      {0x0000a154, 0x02010202},
+-      {0x0000a158, 0x021f0200},
+-      {0x0000a15c, 0x0302021e},
+-      {0x0000a160, 0x03000301},
+-      {0x0000a164, 0x031e031f},
+-      {0x0000a168, 0x0402031d},
+-      {0x0000a16c, 0x04000401},
+-      {0x0000a170, 0x041e041f},
+-      {0x0000a174, 0x0502041d},
+-      {0x0000a178, 0x05000501},
+-      {0x0000a17c, 0x051e051f},
+-      {0x0000a180, 0x06010602},
+-      {0x0000a184, 0x061f0600},
+-      {0x0000a188, 0x061d061e},
+-      {0x0000a18c, 0x07020703},
+-      {0x0000a190, 0x07000701},
+-      {0x0000a194, 0x00000000},
+-      {0x0000a198, 0x00000000},
+-      {0x0000a19c, 0x00000000},
+-      {0x0000a1a0, 0x00000000},
+-      {0x0000a1a4, 0x00000000},
+-      {0x0000a1a8, 0x00000000},
+-      {0x0000a1ac, 0x00000000},
+-      {0x0000a1b0, 0x00000000},
+-      {0x0000a1b4, 0x00000000},
+-      {0x0000a1b8, 0x00000000},
+-      {0x0000a1bc, 0x00000000},
+-      {0x0000a1c0, 0x00000000},
+-      {0x0000a1c4, 0x00000000},
+-      {0x0000a1c8, 0x00000000},
+-      {0x0000a1cc, 0x00000000},
+-      {0x0000a1d0, 0x00000000},
+-      {0x0000a1d4, 0x00000000},
+-      {0x0000a1d8, 0x00000000},
+-      {0x0000a1dc, 0x00000000},
+-      {0x0000a1e0, 0x00000000},
+-      {0x0000a1e4, 0x00000000},
+-      {0x0000a1e8, 0x00000000},
+-      {0x0000a1ec, 0x00000000},
+-      {0x0000a1f0, 0x00000396},
+-      {0x0000a1f4, 0x00000396},
+-      {0x0000a1f8, 0x00000396},
+-      {0x0000a1fc, 0x00000196},
+-      {0x0000b000, 0x00010000},
+-      {0x0000b004, 0x00030002},
+-      {0x0000b008, 0x00050004},
+-      {0x0000b00c, 0x00810080},
+-      {0x0000b010, 0x00830082},
+-      {0x0000b014, 0x01810180},
+-      {0x0000b018, 0x01830182},
+-      {0x0000b01c, 0x01850184},
+-      {0x0000b020, 0x02810280},
+-      {0x0000b024, 0x02830282},
+-      {0x0000b028, 0x02850284},
+-      {0x0000b02c, 0x02890288},
+-      {0x0000b030, 0x028b028a},
+-      {0x0000b034, 0x0388028c},
+-      {0x0000b038, 0x038a0389},
+-      {0x0000b03c, 0x038c038b},
+-      {0x0000b040, 0x0390038d},
+-      {0x0000b044, 0x03920391},
+-      {0x0000b048, 0x03940393},
+-      {0x0000b04c, 0x03960395},
+-      {0x0000b050, 0x00000000},
+-      {0x0000b054, 0x00000000},
+-      {0x0000b058, 0x00000000},
+-      {0x0000b05c, 0x00000000},
+-      {0x0000b060, 0x00000000},
+-      {0x0000b064, 0x00000000},
+-      {0x0000b068, 0x00000000},
+-      {0x0000b06c, 0x00000000},
+-      {0x0000b070, 0x00000000},
+-      {0x0000b074, 0x00000000},
+-      {0x0000b078, 0x00000000},
+-      {0x0000b07c, 0x00000000},
+-      {0x0000b080, 0x23232323},
+-      {0x0000b084, 0x21232323},
+-      {0x0000b088, 0x19191c1e},
+-      {0x0000b08c, 0x12141417},
+-      {0x0000b090, 0x07070e0e},
+-      {0x0000b094, 0x03030305},
+-      {0x0000b098, 0x00000003},
+-      {0x0000b09c, 0x00000000},
+-      {0x0000b0a0, 0x00000000},
+-      {0x0000b0a4, 0x00000000},
+-      {0x0000b0a8, 0x00000000},
+-      {0x0000b0ac, 0x00000000},
+-      {0x0000b0b0, 0x00000000},
+-      {0x0000b0b4, 0x00000000},
+-      {0x0000b0b8, 0x00000000},
+-      {0x0000b0bc, 0x00000000},
+-      {0x0000b0c0, 0x003f0020},
+-      {0x0000b0c4, 0x00400041},
+-      {0x0000b0c8, 0x0140005f},
+-      {0x0000b0cc, 0x0160015f},
+-      {0x0000b0d0, 0x017e017f},
+-      {0x0000b0d4, 0x02410242},
+-      {0x0000b0d8, 0x025f0240},
+-      {0x0000b0dc, 0x027f0260},
+-      {0x0000b0e0, 0x0341027e},
+-      {0x0000b0e4, 0x035f0340},
+-      {0x0000b0e8, 0x037f0360},
+-      {0x0000b0ec, 0x04400441},
+-      {0x0000b0f0, 0x0460045f},
+-      {0x0000b0f4, 0x0541047f},
+-      {0x0000b0f8, 0x055f0540},
+-      {0x0000b0fc, 0x057f0560},
+-      {0x0000b100, 0x06400641},
+-      {0x0000b104, 0x0660065f},
+-      {0x0000b108, 0x067e067f},
+-      {0x0000b10c, 0x07410742},
+-      {0x0000b110, 0x075f0740},
+-      {0x0000b114, 0x077f0760},
+-      {0x0000b118, 0x07800781},
+-      {0x0000b11c, 0x07a0079f},
+-      {0x0000b120, 0x07c107bf},
+-      {0x0000b124, 0x000007c0},
+-      {0x0000b128, 0x00000000},
+-      {0x0000b12c, 0x00000000},
+-      {0x0000b130, 0x00000000},
+-      {0x0000b134, 0x00000000},
+-      {0x0000b138, 0x00000000},
+-      {0x0000b13c, 0x00000000},
+-      {0x0000b140, 0x003f0020},
+-      {0x0000b144, 0x00400041},
+-      {0x0000b148, 0x0140005f},
+-      {0x0000b14c, 0x0160015f},
+-      {0x0000b150, 0x017e017f},
+-      {0x0000b154, 0x02410242},
+-      {0x0000b158, 0x025f0240},
+-      {0x0000b15c, 0x027f0260},
+-      {0x0000b160, 0x0341027e},
+-      {0x0000b164, 0x035f0340},
+-      {0x0000b168, 0x037f0360},
+-      {0x0000b16c, 0x04400441},
+-      {0x0000b170, 0x0460045f},
+-      {0x0000b174, 0x0541047f},
+-      {0x0000b178, 0x055f0540},
+-      {0x0000b17c, 0x057f0560},
+-      {0x0000b180, 0x06400641},
+-      {0x0000b184, 0x0660065f},
+-      {0x0000b188, 0x067e067f},
+-      {0x0000b18c, 0x07410742},
+-      {0x0000b190, 0x075f0740},
+-      {0x0000b194, 0x077f0760},
+-      {0x0000b198, 0x07800781},
+-      {0x0000b19c, 0x07a0079f},
+-      {0x0000b1a0, 0x07c107bf},
+-      {0x0000b1a4, 0x000007c0},
+-      {0x0000b1a8, 0x00000000},
+-      {0x0000b1ac, 0x00000000},
+-      {0x0000b1b0, 0x00000000},
+-      {0x0000b1b4, 0x00000000},
+-      {0x0000b1b8, 0x00000000},
+-      {0x0000b1bc, 0x00000000},
+-      {0x0000b1c0, 0x00000000},
+-      {0x0000b1c4, 0x00000000},
+-      {0x0000b1c8, 0x00000000},
+-      {0x0000b1cc, 0x00000000},
+-      {0x0000b1d0, 0x00000000},
+-      {0x0000b1d4, 0x00000000},
+-      {0x0000b1d8, 0x00000000},
+-      {0x0000b1dc, 0x00000000},
+-      {0x0000b1e0, 0x00000000},
+-      {0x0000b1e4, 0x00000000},
+-      {0x0000b1e8, 0x00000000},
+-      {0x0000b1ec, 0x00000000},
+-      {0x0000b1f0, 0x00000396},
+-      {0x0000b1f4, 0x00000396},
+-      {0x0000b1f8, 0x00000396},
+-      {0x0000b1fc, 0x00000196},
+-};
+-
+ static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+@@ -1437,8 +1185,6 @@ static const u32 ar9340_1p0_mac_core[][2
+       {0x000083d0, 0x000101ff},
+ };
+-#define ar9340Common_wo_xlna_rx_gain_table_1p0 ar9300Common_wo_xlna_rx_gain_table_2p2
+-
+ static const u32 ar9340_1p0_soc_preamble[][2] = {
+       /* Addr      allmodes  */
+       {0x00007008, 0x00000000},
+@@ -1447,4 +1193,106 @@ static const u32 ar9340_1p0_soc_preamble
+       {0x00007038, 0x000004c2},
+ };
++static const u32 ar9340_cus227_tx_gain_table_1p0[][5] = {
++      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
++      {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++      {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++      {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
++      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
++      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
++      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
++      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
++      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
++      {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
++      {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
++      {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
++      {0x0000a520, 0x2c022220, 0x2c022220, 0x1b000603, 0x1b000603},
++      {0x0000a524, 0x30022222, 0x30022222, 0x1f000a02, 0x1f000a02},
++      {0x0000a528, 0x35022225, 0x35022225, 0x23000a04, 0x23000a04},
++      {0x0000a52c, 0x3b02222a, 0x3b02222a, 0x26000a20, 0x26000a20},
++      {0x0000a530, 0x3f02222c, 0x3f02222c, 0x2a000e20, 0x2a000e20},
++      {0x0000a534, 0x4202242a, 0x4202242a, 0x2e000e22, 0x2e000e22},
++      {0x0000a538, 0x4702244a, 0x4702244a, 0x31000e24, 0x31000e24},
++      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x34001640, 0x34001640},
++      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
++      {0x0000a544, 0x5302266c, 0x5302266c, 0x3b001861, 0x3b001861},
++      {0x0000a548, 0x5702286c, 0x5702286c, 0x3e001a81, 0x3e001a81},
++      {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42001a83, 0x42001a83},
++      {0x0000a550, 0x61024a6c, 0x61024a6c, 0x44001c84, 0x44001c84},
++      {0x0000a554, 0x66026a6c, 0x66026a6c, 0x48001ce3, 0x48001ce3},
++      {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c001ce5, 0x4c001ce5},
++      {0x0000a55c, 0x7002708c, 0x7002708c, 0x50001ce9, 0x50001ce9},
++      {0x0000a560, 0x7302b08a, 0x7302b08a, 0x54001ceb, 0x54001ceb},
++      {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++      {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++      {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++      {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++      {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++      {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++      {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++      {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
++      {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
++      {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
++      {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
++      {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
++      {0x0000a594, 0x1c800223, 0x1c800223, 0x11800400, 0x11800400},
++      {0x0000a598, 0x21820220, 0x21820220, 0x15800402, 0x15800402},
++      {0x0000a59c, 0x27820223, 0x27820223, 0x19800404, 0x19800404},
++      {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800603, 0x1b800603},
++      {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800a02, 0x1f800a02},
++      {0x0000a5a8, 0x34822225, 0x34822225, 0x23800a04, 0x23800a04},
++      {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x26800a20, 0x26800a20},
++      {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2a800e20, 0x2a800e20},
++      {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2e800e22, 0x2e800e22},
++      {0x0000a5b8, 0x4782244a, 0x4782244a, 0x31800e24, 0x31800e24},
++      {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x34801640, 0x34801640},
++      {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38801660, 0x38801660},
++      {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b801861, 0x3b801861},
++      {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e801a81, 0x3e801a81},
++      {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42801a83, 0x42801a83},
++      {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x44801c84, 0x44801c84},
++      {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x48801ce3, 0x48801ce3},
++      {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c801ce5, 0x4c801ce5},
++      {0x0000a5dc, 0x7086308c, 0x7086308c, 0x50801ce9, 0x50801ce9},
++      {0x0000a5e0, 0x738a308a, 0x738a308a, 0x54801ceb, 0x54801ceb},
++      {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++      {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++      {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++      {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++      {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++      {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++      {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++      {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
++      {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
++      {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
++      {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
++      {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
++      {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
++      {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
++      {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++      {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++      {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++      {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++      {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++      {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++      {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
++      {0x00016044, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
++      {0x00016048, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
++      {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
++      {0x00016288, 0x30318000, 0x30318000, 0x00318000, 0x00318000},
++      {0x00016444, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
++      {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
++      {0x0000a3a4, 0x00000011, 0x00000011, 0x00000011, 0x00000011},
++      {0x0000a3a8, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c},
++      {0x0000a3ac, 0x30303030, 0x30303030, 0x30303030, 0x30303030},
++};
++
+ #endif /* INITVALS_9340_H */
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -459,6 +459,7 @@ void ath_check_ani(struct ath_softc *sc)
+ int ath_update_survey_stats(struct ath_softc *sc);
+ void ath_update_survey_nf(struct ath_softc *sc, int channel);
+ void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
++void ath_ps_full_sleep(unsigned long data);
+ /**********/
+ /* BTCOEX */
+@@ -570,6 +571,34 @@ static inline void ath_fill_led_pin(stru
+ }
+ #endif
++/************************/
++/* Wake on Wireless LAN */
++/************************/
++
++#ifdef CONFIG_ATH9K_WOW
++void ath9k_init_wow(struct ieee80211_hw *hw);
++int ath9k_suspend(struct ieee80211_hw *hw,
++                struct cfg80211_wowlan *wowlan);
++int ath9k_resume(struct ieee80211_hw *hw);
++void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled);
++#else
++static inline void ath9k_init_wow(struct ieee80211_hw *hw)
++{
++}
++static inline int ath9k_suspend(struct ieee80211_hw *hw,
++                              struct cfg80211_wowlan *wowlan)
++{
++      return 0;
++}
++static inline int ath9k_resume(struct ieee80211_hw *hw)
++{
++      return 0;
++}
++static inline void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
++{
++}
++#endif /* CONFIG_ATH9K_WOW */
++
+ /*******************************/
+ /* Antenna diversity/combining */
+ /*******************************/
+@@ -632,15 +661,16 @@ void ath_ant_comb_scan(struct ath_softc 
+ /* Main driver core */
+ /********************/
+-#define ATH9K_PCI_CUS198      0x0001
+-#define ATH9K_PCI_CUS230      0x0002
+-#define ATH9K_PCI_CUS217      0x0004
+-#define ATH9K_PCI_CUS252      0x0008
+-#define ATH9K_PCI_WOW         0x0010
+-#define ATH9K_PCI_BT_ANT_DIV  0x0020
+-#define ATH9K_PCI_D3_L1_WAR   0x0040
+-#define ATH9K_PCI_AR9565_1ANT 0x0080
+-#define ATH9K_PCI_AR9565_2ANT 0x0100
++#define ATH9K_PCI_CUS198          0x0001
++#define ATH9K_PCI_CUS230          0x0002
++#define ATH9K_PCI_CUS217          0x0004
++#define ATH9K_PCI_CUS252          0x0008
++#define ATH9K_PCI_WOW             0x0010
++#define ATH9K_PCI_BT_ANT_DIV      0x0020
++#define ATH9K_PCI_D3_L1_WAR       0x0040
++#define ATH9K_PCI_AR9565_1ANT     0x0080
++#define ATH9K_PCI_AR9565_2ANT     0x0100
++#define ATH9K_PCI_NO_PLL_PWRSAVE  0x0200
+ /*
+  * Default cache line size, in bytes.
+@@ -723,6 +753,7 @@ struct ath_softc {
+       struct work_struct hw_check_work;
+       struct work_struct hw_reset_work;
+       struct completion paprd_complete;
++      wait_queue_head_t tx_wait;
+       unsigned int hw_busy_count;
+       unsigned long sc_flags;
+@@ -759,6 +790,7 @@ struct ath_softc {
+       struct delayed_work tx_complete_work;
+       struct delayed_work hw_pll_work;
+       struct timer_list rx_poll_timer;
++      struct timer_list sleep_timer;
+ #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
+       struct ath_btcoex btcoex;
+@@ -783,7 +815,7 @@ struct ath_softc {
+       bool tx99_state;
+       s16 tx99_power;
+-#ifdef CONFIG_PM_SLEEP
++#ifdef CONFIG_ATH9K_WOW
+       atomic_t wow_got_bmiss_intr;
+       atomic_t wow_sleep_proc_intr; /* in the middle of WoW sleep ? */
+       u32 wow_intr_before_sleep;
+@@ -946,10 +978,25 @@ struct fft_sample_ht20_40 {
+       u8 data[SPECTRAL_HT20_40_NUM_BINS];
+ } __packed;
+-int ath9k_tx99_init(struct ath_softc *sc);
+-void ath9k_tx99_deinit(struct ath_softc *sc);
++/********/
++/* TX99 */
++/********/
++
++#ifdef CONFIG_ATH9K_TX99
++void ath9k_tx99_init_debug(struct ath_softc *sc);
+ int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,
+                   struct ath_tx_control *txctl);
++#else
++static inline void ath9k_tx99_init_debug(struct ath_softc *sc)
++{
++}
++static inline int ath9k_tx99_send(struct ath_softc *sc,
++                                struct sk_buff *skb,
++                                struct ath_tx_control *txctl)
++{
++      return 0;
++}
++#endif /* CONFIG_ATH9K_TX99 */
+ void ath9k_tasklet(unsigned long data);
+ int ath_cabq_update(struct ath_softc *);
+@@ -966,6 +1013,9 @@ extern bool is_ath9k_unloaded;
+ u8 ath9k_parse_mpdudensity(u8 mpdudensity);
+ irqreturn_t ath_isr(int irq, void *dev);
++int ath_reset(struct ath_softc *sc);
++void ath_cancel_work(struct ath_softc *sc);
++void ath_restart_work(struct ath_softc *sc);
+ int ath9k_init_device(u16 devid, struct ath_softc *sc,
+                   const struct ath_bus_ops *bus_ops);
+ void ath9k_deinit_device(struct ath_softc *sc);
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1782,111 +1782,6 @@ void ath9k_deinit_debug(struct ath_softc
+       }
+ }
+-static ssize_t read_file_tx99(struct file *file, char __user *user_buf,
+-                            size_t count, loff_t *ppos)
+-{
+-      struct ath_softc *sc = file->private_data;
+-      char buf[3];
+-      unsigned int len;
+-
+-      len = sprintf(buf, "%d\n", sc->tx99_state);
+-      return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+-}
+-
+-static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,
+-                             size_t count, loff_t *ppos)
+-{
+-      struct ath_softc *sc = file->private_data;
+-      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+-      char buf[32];
+-      bool start;
+-      ssize_t len;
+-      int r;
+-
+-      if (sc->nvifs > 1)
+-              return -EOPNOTSUPP;
+-
+-      len = min(count, sizeof(buf) - 1);
+-      if (copy_from_user(buf, user_buf, len))
+-              return -EFAULT;
+-
+-      if (strtobool(buf, &start))
+-              return -EINVAL;
+-
+-      if (start == sc->tx99_state) {
+-              if (!start)
+-                      return count;
+-              ath_dbg(common, XMIT, "Resetting TX99\n");
+-              ath9k_tx99_deinit(sc);
+-      }
+-
+-      if (!start) {
+-              ath9k_tx99_deinit(sc);
+-              return count;
+-      }
+-
+-      r = ath9k_tx99_init(sc);
+-      if (r)
+-              return r;
+-
+-      return count;
+-}
+-
+-static const struct file_operations fops_tx99 = {
+-      .read = read_file_tx99,
+-      .write = write_file_tx99,
+-      .open = simple_open,
+-      .owner = THIS_MODULE,
+-      .llseek = default_llseek,
+-};
+-
+-static ssize_t read_file_tx99_power(struct file *file,
+-                                  char __user *user_buf,
+-                                  size_t count, loff_t *ppos)
+-{
+-      struct ath_softc *sc = file->private_data;
+-      char buf[32];
+-      unsigned int len;
+-
+-      len = sprintf(buf, "%d (%d dBm)\n",
+-                    sc->tx99_power,
+-                    sc->tx99_power / 2);
+-
+-      return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+-}
+-
+-static ssize_t write_file_tx99_power(struct file *file,
+-                                   const char __user *user_buf,
+-                                   size_t count, loff_t *ppos)
+-{
+-      struct ath_softc *sc = file->private_data;
+-      int r;
+-      u8 tx_power;
+-
+-      r = kstrtou8_from_user(user_buf, count, 0, &tx_power);
+-      if (r)
+-              return r;
+-
+-      if (tx_power > MAX_RATE_POWER)
+-              return -EINVAL;
+-
+-      sc->tx99_power = tx_power;
+-
+-      ath9k_ps_wakeup(sc);
+-      ath9k_hw_tx99_set_txpower(sc->sc_ah, sc->tx99_power);
+-      ath9k_ps_restore(sc);
+-
+-      return count;
+-}
+-
+-static const struct file_operations fops_tx99_power = {
+-      .read = read_file_tx99_power,
+-      .write = write_file_tx99_power,
+-      .open = simple_open,
+-      .owner = THIS_MODULE,
+-      .llseek = default_llseek,
+-};
+-
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+       struct ath_common *common = ath9k_hw_common(ah);
+@@ -1903,6 +1798,7 @@ int ath9k_init_debug(struct ath_hw *ah)
+ #endif
+       ath9k_dfs_init_debug(sc);
++      ath9k_tx99_init_debug(sc);
+       debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
+                           &fops_dma);
+@@ -1978,15 +1874,6 @@ int ath9k_init_debug(struct ath_hw *ah)
+       debugfs_create_file("btcoex", S_IRUSR, sc->debug.debugfs_phy, sc,
+                           &fops_btcoex);
+ #endif
+-      if (config_enabled(CPTCFG_ATH9K_TX99) &&
+-          AR_SREV_9300_20_OR_LATER(ah)) {
+-              debugfs_create_file("tx99", S_IRUSR | S_IWUSR,
+-                                  sc->debug.debugfs_phy, sc,
+-                                  &fops_tx99);
+-              debugfs_create_file("tx99_power", S_IRUSR | S_IWUSR,
+-                                  sc->debug.debugfs_phy, sc,
+-                                  &fops_tx99_power);
+-      }
+       return 0;
+ }
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -17,6 +17,7 @@
+ #include <linux/io.h>
+ #include <linux/slab.h>
+ #include <linux/module.h>
++#include <linux/time.h>
+ #include <asm/unaligned.h>
+ #include "hw.h"
+@@ -454,7 +455,6 @@ static void ath9k_hw_init_config(struct 
+       }
+       ah->config.rx_intr_mitigation = true;
+-      ah->config.pcieSerDesWrite = true;
+       /*
+        * We need this for PCI devices only (Cardbus, PCI, miniPCI)
+@@ -549,11 +549,11 @@ static int ath9k_hw_post_init(struct ath
+        * EEPROM needs to be initialized before we do this.
+        * This is required for regulatory compliance.
+        */
+-      if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
++      if (AR_SREV_9300_20_OR_LATER(ah)) {
+               u16 regdmn = ah->eep_ops->get_eeprom(ah, EEP_REG_0);
+               if ((regdmn & 0xF0) == CTL_FCC) {
+-                      ah->nf_2g.max = AR_PHY_CCA_MAX_GOOD_VAL_9462_FCC_2GHZ;
+-                      ah->nf_5g.max = AR_PHY_CCA_MAX_GOOD_VAL_9462_FCC_5GHZ;
++                      ah->nf_2g.max = AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_2GHZ;
++                      ah->nf_5g.max = AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_5GHZ;
+               }
+       }
+@@ -1502,8 +1502,9 @@ static bool ath9k_hw_channel_change(stru
+       int r;
+       if (pCap->hw_caps & ATH9K_HW_CAP_FCC_BAND_SWITCH) {
+-              band_switch = IS_CHAN_5GHZ(ah->curchan) != IS_CHAN_5GHZ(chan);
+-              mode_diff = (chan->channelFlags != ah->curchan->channelFlags);
++              u32 flags_diff = chan->channelFlags ^ ah->curchan->channelFlags;
++              band_switch = !!(flags_diff & CHANNEL_5GHZ);
++              mode_diff = !!(flags_diff & ~CHANNEL_HT);
+       }
+       for (qnum = 0; qnum < AR_NUM_QCU; qnum++) {
+@@ -1815,7 +1816,7 @@ static int ath9k_hw_do_fastcc(struct ath
+        * If cross-band fcc is not supoprted, bail out if channelFlags differ.
+        */
+       if (!(pCap->hw_caps & ATH9K_HW_CAP_FCC_BAND_SWITCH) &&
+-          chan->channelFlags != ah->curchan->channelFlags)
++          ((chan->channelFlags ^ ah->curchan->channelFlags) & ~CHANNEL_HT))
+               goto fail;
+       if (!ath9k_hw_check_alive(ah))
+@@ -1856,10 +1857,12 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+                  struct ath9k_hw_cal_data *caldata, bool fastcc)
+ {
+       struct ath_common *common = ath9k_hw_common(ah);
++      struct timespec ts;
+       u32 saveLedState;
+       u32 saveDefAntenna;
+       u32 macStaId1;
+       u64 tsf = 0;
++      s64 usec = 0;
+       int r;
+       bool start_mci_reset = false;
+       bool save_fullsleep = ah->chip_fullsleep;
+@@ -1902,10 +1905,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+       macStaId1 = REG_READ(ah, AR_STA_ID1) & AR_STA_ID1_BASE_RATE_11B;
+-      /* For chips on which RTC reset is done, save TSF before it gets cleared */
+-      if (AR_SREV_9100(ah) ||
+-          (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)))
+-              tsf = ath9k_hw_gettsf64(ah);
++      /* Save TSF before chip reset, a cold reset clears it */
++      tsf = ath9k_hw_gettsf64(ah);
++      getrawmonotonic(&ts);
++      usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000;
+       saveLedState = REG_READ(ah, AR_CFG_LED) &
+               (AR_CFG_LED_ASSOC_CTL | AR_CFG_LED_MODE_SEL |
+@@ -1938,8 +1941,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+       }
+       /* Restore TSF */
+-      if (tsf)
+-              ath9k_hw_settsf64(ah, tsf);
++      getrawmonotonic(&ts);
++      usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000 - usec;
++      ath9k_hw_settsf64(ah, tsf + usec);
+       if (AR_SREV_9280_20_OR_LATER(ah))
+               REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -283,7 +283,6 @@ struct ath9k_ops_config {
+       int additional_swba_backoff;
+       int ack_6mb;
+       u32 cwm_ignore_extcca;
+-      bool pcieSerDesWrite;
+       u8 pcie_clock_req;
+       u32 pcie_waen;
+       u8 analog_shiftreg;
+@@ -316,6 +315,8 @@ struct ath9k_ops_config {
+       u32 ant_ctrl_comm2g_switch_enable;
+       bool xatten_margin_cfg;
+       bool alt_mingainidx;
++      bool no_pll_pwrsave;
++      bool tx_gain_buffalo;
+ };
+ enum ath9k_int {
+@@ -864,6 +865,7 @@ struct ath_hw {
+       u32 gpio_mask;
+       u32 gpio_val;
++      struct ar5416IniArray ini_dfs;
+       struct ar5416IniArray iniModes;
+       struct ar5416IniArray iniCommon;
+       struct ar5416IniArray iniBB_RfGain;
+@@ -920,7 +922,7 @@ struct ath_hw {
+       /* Enterprise mode cap */
+       u32 ent_mode;
+-#ifdef CONFIG_PM_SLEEP
++#ifdef CONFIG_ATH9K_WOW
+       u32 wow_event_mask;
+ #endif
+       bool is_clk_25mhz;
+@@ -1126,7 +1128,7 @@ ath9k_hw_get_btcoex_scheme(struct ath_hw
+ #endif /* CPTCFG_ATH9K_BTCOEX_SUPPORT */
+-#ifdef CONFIG_PM_SLEEP
++#ifdef CONFIG_ATH9K_WOW
+ const char *ath9k_hw_wow_event_to_string(u32 wow_event);
+ void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
+                               u8 *user_mask, int pattern_count,
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -554,7 +554,7 @@ static void ath9k_init_misc(struct ath_s
+       sc->spec_config.fft_period = 0xF;
+ }
+-static void ath9k_init_platform(struct ath_softc *sc)
++static void ath9k_init_pcoem_platform(struct ath_softc *sc)
+ {
+       struct ath_hw *ah = sc->sc_ah;
+       struct ath9k_hw_capabilities *pCap = &ah->caps;
 @@ -609,6 +609,11 @@ static void ath9k_init_platform(struct a
                ah->config.pcie_waen = 0x0040473b;
                ath_info(common, "Enable WAR for ASPM D3/L1\n");
  }
  
  static void ath9k_eeprom_request_cb(const struct firmware *eeprom_blob,
-@@ -683,6 +688,7 @@ static int ath9k_init_softc(u16 devid, s
+@@ -656,6 +661,27 @@ static void ath9k_eeprom_release(struct 
+       release_firmware(sc->sc_ah->eeprom_blob);
+ }
++static int ath9k_init_soc_platform(struct ath_softc *sc)
++{
++      struct ath9k_platform_data *pdata = sc->dev->platform_data;
++      struct ath_hw *ah = sc->sc_ah;
++      int ret = 0;
++
++      if (!pdata)
++              return 0;
++
++      if (pdata->eeprom_name) {
++              ret = ath9k_eeprom_request(sc, pdata->eeprom_name);
++              if (ret)
++                      return ret;
++      }
++
++      if (pdata->tx_gain_buffalo)
++              ah->config.tx_gain_buffalo = true;
++
++      return ret;
++}
++
+ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
+                           const struct ath_bus_ops *bus_ops)
+ {
+@@ -683,6 +709,7 @@ static int ath9k_init_softc(u16 devid, s
        common = ath9k_hw_common(ah);
        sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);
        sc->tx99_power = MAX_RATE_POWER + 1;
  
        if (!pdata) {
                ah->ah_flags |= AH_USE_EEPROM;
-@@ -730,6 +736,7 @@ static int ath9k_init_softc(u16 devid, s
+@@ -708,7 +735,11 @@ static int ath9k_init_softc(u16 devid, s
+       /*
+        * Platform quirks.
+        */
+-      ath9k_init_platform(sc);
++      ath9k_init_pcoem_platform(sc);
++
++      ret = ath9k_init_soc_platform(sc);
++      if (ret)
++              return ret;
+       /*
+        * Enable WLAN/BT RX Antenna diversity only when:
+@@ -722,7 +753,6 @@ static int ath9k_init_softc(u16 devid, s
+               common->bt_ant_diversity = 1;
+       spin_lock_init(&common->cc_lock);
+-
+       spin_lock_init(&sc->sc_serial_rw);
+       spin_lock_init(&sc->sc_pm_lock);
+       mutex_init(&sc->mutex);
+@@ -730,6 +760,7 @@ static int ath9k_init_softc(u16 devid, s
        tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
                     (unsigned long)sc);
  
        INIT_WORK(&sc->hw_reset_work, ath_reset_work);
        INIT_WORK(&sc->hw_check_work, ath_hw_check);
        INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
-@@ -845,7 +852,8 @@ static const struct ieee80211_iface_limi
+@@ -743,12 +774,6 @@ static int ath9k_init_softc(u16 devid, s
+       ath_read_cachesize(common, &csz);
+       common->cachelsz = csz << 2; /* convert to bytes */
+-      if (pdata && pdata->eeprom_name) {
+-              ret = ath9k_eeprom_request(sc, pdata->eeprom_name);
+-              if (ret)
+-                      return ret;
+-      }
+-
+       /* Initializes the hardware for all supported chipsets */
+       ret = ath9k_hw_init(ah);
+       if (ret)
+@@ -845,7 +870,8 @@ static const struct ieee80211_iface_limi
  };
  
  static const struct ieee80211_iface_limit if_dfs_limits[] = {
  };
  
  static const struct ieee80211_iface_combination if_comb[] = {
-@@ -862,20 +870,11 @@ static const struct ieee80211_iface_comb
+@@ -862,20 +888,11 @@ static const struct ieee80211_iface_comb
                .max_interfaces = 1,
                .num_different_channels = 1,
                .beacon_int_infra_match = true,
  void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
  {
        struct ath_hw *ah = sc->sc_ah;
-@@ -925,16 +924,6 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -925,16 +942,6 @@ void ath9k_set_hw_capab(struct ath_softc
        hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_5_10_MHZ;
        hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
  
        hw->queues = 4;
        hw->max_rates = 4;
        hw->channel_change_time = 5000;
-@@ -960,6 +949,7 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -960,6 +967,7 @@ void ath9k_set_hw_capab(struct ath_softc
                hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
                        &sc->sbands[IEEE80211_BAND_5GHZ];
  
        ath9k_reload_chainmask_settings(sc);
  
        SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
-@@ -1058,6 +1048,7 @@ static void ath9k_deinit_softc(struct at
+@@ -1058,6 +1066,7 @@ static void ath9k_deinit_softc(struct at
                if (ATH_TXQ_SETUP(sc, i))
                        ath_tx_cleanupq(sc, &sc->tx.txq[i]);
  
        /*
         * RXGAIN initvals.
         */
+@@ -1281,6 +1332,7 @@ static void ar9003_hw_ani_cache_ini_regs
+ static void ar9003_hw_set_radar_params(struct ath_hw *ah,
+                                      struct ath_hw_radar_conf *conf)
+ {
++      unsigned int regWrites = 0;
+       u32 radar_0 = 0, radar_1 = 0;
+       if (!conf) {
+@@ -1307,6 +1359,11 @@ static void ar9003_hw_set_radar_params(s
+               REG_SET_BIT(ah, AR_PHY_RADAR_EXT, AR_PHY_RADAR_EXT_ENA);
+       else
+               REG_CLR_BIT(ah, AR_PHY_RADAR_EXT, AR_PHY_RADAR_EXT_ENA);
++
++      if (AR_SREV_9300(ah) || AR_SREV_9340(ah) || AR_SREV_9580(ah)) {
++              REG_WRITE_ARRAY(&ah->ini_dfs,
++                              IS_CHAN_HT40(ah->curchan) ? 2 : 1, regWrites);
++      }
+ }
+ static void ar9003_hw_set_radar_conf(struct ath_hw *ah)
 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -656,13 +656,24 @@
+@@ -341,14 +341,15 @@
+ #define AR_PHY_CCA_MAX_GOOD_VAL_9300_2GHZ     -95
+ #define AR_PHY_CCA_MAX_GOOD_VAL_9300_5GHZ     -100
++#define AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_2GHZ -95
++#define AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_5GHZ -100
++
+ #define AR_PHY_CCA_NOM_VAL_9462_2GHZ          -127
+ #define AR_PHY_CCA_MIN_GOOD_VAL_9462_2GHZ     -127
+ #define AR_PHY_CCA_MAX_GOOD_VAL_9462_2GHZ     -60
+-#define AR_PHY_CCA_MAX_GOOD_VAL_9462_FCC_2GHZ -95
+ #define AR_PHY_CCA_NOM_VAL_9462_5GHZ          -127
+ #define AR_PHY_CCA_MIN_GOOD_VAL_9462_5GHZ     -127
+ #define AR_PHY_CCA_MAX_GOOD_VAL_9462_5GHZ     -60
+-#define AR_PHY_CCA_MAX_GOOD_VAL_9462_FCC_5GHZ -100
+ #define AR_PHY_CCA_NOM_VAL_9330_2GHZ          -118
+@@ -656,13 +657,24 @@
  #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT   ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x00000001 : 0x00000002)
  #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT_S ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0 : 1)
  #define AR_PHY_65NM_CH0_SYNTH7      0x16098
  }
 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-@@ -1040,14 +1040,14 @@ static void ar9003_hw_cl_cal_post_proc(s
+@@ -898,7 +898,7 @@ static void ar9003_hw_tx_iq_cal_reload(s
+ static void ar9003_hw_manual_peak_cal(struct ath_hw *ah, u8 chain, bool is_2g)
+ {
+-      int offset[8], total = 0, test;
++      int offset[8] = {0}, total = 0, test;
+       int agc_out, i;
+       REG_RMW_FIELD(ah, AR_PHY_65NM_RXRF_GAINSTAGES(chain),
+@@ -923,12 +923,18 @@ static void ar9003_hw_manual_peak_cal(st
+                     AR_PHY_65NM_RXRF_AGC_AGC_ON_OVR, 0x1);
+       REG_RMW_FIELD(ah, AR_PHY_65NM_RXRF_AGC(chain),
+                     AR_PHY_65NM_RXRF_AGC_AGC_CAL_OVR, 0x1);
+-      if (is_2g)
+-              REG_RMW_FIELD(ah, AR_PHY_65NM_RXRF_AGC(chain),
+-                            AR_PHY_65NM_RXRF_AGC_AGC2G_DBDAC_OVR, 0x0);
+-      else
++
++      if (AR_SREV_9330_11(ah)) {
+               REG_RMW_FIELD(ah, AR_PHY_65NM_RXRF_AGC(chain),
+-                            AR_PHY_65NM_RXRF_AGC_AGC5G_DBDAC_OVR, 0x0);
++                            AR_PHY_65NM_RXRF_AGC_AGC2G_CALDAC_OVR, 0x0);
++      } else {
++              if (is_2g)
++                      REG_RMW_FIELD(ah, AR_PHY_65NM_RXRF_AGC(chain),
++                                    AR_PHY_65NM_RXRF_AGC_AGC2G_DBDAC_OVR, 0x0);
++              else
++                      REG_RMW_FIELD(ah, AR_PHY_65NM_RXRF_AGC(chain),
++                                    AR_PHY_65NM_RXRF_AGC_AGC5G_DBDAC_OVR, 0x0);
++      }
+       for (i = 6; i > 0; i--) {
+               offset[i] = BIT(i - 1);
+@@ -964,9 +970,9 @@ static void ar9003_hw_manual_peak_cal(st
+                     AR_PHY_65NM_RXRF_AGC_AGC_CAL_OVR, 0);
+ }
+-static void ar9003_hw_do_manual_peak_cal(struct ath_hw *ah,
+-                                       struct ath9k_channel *chan,
+-                                       bool run_rtt_cal)
++static void ar9003_hw_do_pcoem_manual_peak_cal(struct ath_hw *ah,
++                                             struct ath9k_channel *chan,
++                                             bool run_rtt_cal)
+ {
+       struct ath9k_hw_cal_data *caldata = ah->caldata;
+       int i;
+@@ -1040,14 +1046,14 @@ static void ar9003_hw_cl_cal_post_proc(s
        }
  }
  
        bool rtt = !!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT);
        u32 rx_delay = 0;
        u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |
-@@ -1119,22 +1119,12 @@ static bool ar9003_hw_init_cal(struct at
+@@ -1119,22 +1125,12 @@ static bool ar9003_hw_init_cal(struct at
                        REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,
                                    AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);
                txiqcal_done = run_agc_cal = true;
        if (REG_READ(ah, AR_PHY_CL_CAL_CTL) & AR_PHY_CL_CAL_ENABLE) {
                rx_delay = REG_READ(ah, AR_PHY_RX_DELAY);
                /* Disable BB_active */
-@@ -1228,13 +1218,109 @@ skip_tx_iqcal:
+@@ -1155,7 +1151,7 @@ skip_tx_iqcal:
+                                      AR_PHY_AGC_CONTROL_CAL,
+                                      0, AH_WAIT_TIMEOUT);
+-              ar9003_hw_do_manual_peak_cal(ah, chan, run_rtt_cal);
++              ar9003_hw_do_pcoem_manual_peak_cal(ah, chan, run_rtt_cal);
+       }
+       if (REG_READ(ah, AR_PHY_CL_CAL_CTL) & AR_PHY_CL_CAL_ENABLE) {
+@@ -1228,13 +1224,112 @@ skip_tx_iqcal:
        return true;
  }
  
 +
 +skip_tx_iqcal:
 +      if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
++              if (AR_SREV_9330_11(ah))
++                      ar9003_hw_manual_peak_cal(ah, 0, IS_CHAN_2GHZ(chan));
++
 +              /* Calibrate the AGC */
 +              REG_WRITE(ah, AR_PHY_AGC_CONTROL,
 +                        REG_READ(ah, AR_PHY_AGC_CONTROL) |
  }
 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+@@ -3965,7 +3965,7 @@ static void ar9003_hw_apply_tuning_caps(
+       struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+       u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0];
+-      if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah))
++      if (AR_SREV_9340(ah))
+               return;
+       if (eep->baseEepHeader.featureEnable & 0x40) {
 @@ -3984,18 +3984,20 @@ static void ar9003_hw_quick_drop_apply(s
        int quick_drop;
        s32 t[3], f[3] = {5180, 5500, 5785};
                return;
  
        if (!AR_SREV_9300(ah))
+@@ -4120,7 +4122,7 @@ static void ath9k_hw_ar9300_set_board_va
+       ar9003_hw_xlna_bias_strength_apply(ah, is2ghz);
+       ar9003_hw_atten_apply(ah, chan);
+       ar9003_hw_quick_drop_apply(ah, chan->channel);
+-      if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9550(ah))
++      if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah))
+               ar9003_hw_internal_regulator_apply(ah);
+       ar9003_hw_apply_tuning_caps(ah);
+       ar9003_hw_txend_to_xpa_off_apply(ah, is2ghz);
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
 @@ -735,6 +735,7 @@ struct ieee80211_sub_if_data {
  #endif /* INITVALS_9462_2P1_H */
 --- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
 +++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
-@@ -32,13 +32,6 @@ static const u32 ar9485_1_1_mac_postambl
-       {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
- };
+@@ -20,24 +20,11 @@
+ /* AR9485 1.1 */
+-static const u32 ar9485_1_1_mac_postamble[][5] = {
+-      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
+-      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
+-      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
+-      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
+-      {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
+-      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
+-      {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
+-      {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
+-};
++#define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1
  
 -static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
 -      /* Addr      allmodes  */
 -      {0x00018c04, 0x000801d8},
 -      {0x00018c08, 0x0000080c},
 -};
--
++#define ar9485_1_1_mac_postamble ar9331_1p1_mac_postamble
++
++#define ar9485_1_1_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484
  static const u32 ar9485Common_wo_xlna_rx_gain_1_1[][2] = {
        /* Addr      allmodes  */
-       {0x00009e00, 0x037216a0},
-@@ -1101,20 +1094,6 @@ static const u32 ar9485_common_rx_gain_1
+@@ -553,100 +540,6 @@ static const u32 ar9485Modes_low_ob_db_t
+       {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
+ };
+-static const u32 ar9485_modes_lowest_ob_db_tx_gain_1_1[][5] = {
+-      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
+-      {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0x7999a83a, 0x7999a83a},
+-      {0x0000a2dc, 0x00000000, 0x00000000, 0xfe2d3552, 0xfe2d3552},
+-      {0x0000a2e0, 0x00000000, 0x00000000, 0xfe2d3552, 0xfe2d3552},
+-      {0x0000a2e4, 0x00000000, 0x00000000, 0xfe2d3552, 0xfe2d3552},
+-      {0x0000a2e8, 0x00000000, 0x00000000, 0xfe2d3552, 0xfe2d3552},
+-      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
+-      {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
+-      {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
+-      {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
+-      {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
+-      {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
+-      {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
+-      {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
+-      {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
+-      {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
+-      {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
+-      {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
+-      {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
+-      {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
+-      {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
+-      {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
+-      {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
+-      {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
+-      {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
+-      {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
+-      {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
+-      {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
+-      {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
+-      {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
+-      {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
+-      {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
+-      {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
+-      {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+-      {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+-      {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+-      {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+-      {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+-      {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+-      {0x0000a580, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a584, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a588, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a58c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a590, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a594, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a598, 0x00000000, 0x00000000, 0x01404501, 0x01404501},
+-      {0x0000a59c, 0x00000000, 0x00000000, 0x02808a02, 0x02808a02},
+-      {0x0000a5a0, 0x00000000, 0x00000000, 0x02808a02, 0x02808a02},
+-      {0x0000a5a4, 0x00000000, 0x00000000, 0x02808803, 0x02808803},
+-      {0x0000a5a8, 0x00000000, 0x00000000, 0x04c14b04, 0x04c14b04},
+-      {0x0000a5ac, 0x00000000, 0x00000000, 0x04c15305, 0x04c15305},
+-      {0x0000a5b0, 0x00000000, 0x00000000, 0x04c15305, 0x04c15305},
+-      {0x0000a5b4, 0x00000000, 0x00000000, 0x04c15305, 0x04c15305},
+-      {0x0000a5b8, 0x00000000, 0x00000000, 0x04c15305, 0x04c15305},
+-      {0x0000a5bc, 0x00000000, 0x00000000, 0x04c15305, 0x04c15305},
+-      {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
+-      {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
+-};
+-
+ static const u32 ar9485Modes_green_spur_ob_db_tx_gain_1_1[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
+@@ -1101,20 +994,6 @@ static const u32 ar9485_common_rx_gain_1
        {0x0000a1fc, 0x00000296},
  };
  
  static const u32 ar9485_1_1_soc_preamble[][2] = {
        /* Addr      allmodes  */
        {0x00004014, 0xba280400},
-@@ -1173,13 +1152,6 @@ static const u32 ar9485_1_1_baseband_pos
+@@ -1173,13 +1052,6 @@ static const u32 ar9485_1_1_baseband_pos
        {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
  };
  
  static const u32 ar9485_1_1_radio_postamble[][2] = {
        /* Addr      allmodes  */
        {0x0001609c, 0x0b283f31},
-@@ -1358,4 +1330,18 @@ static const u32 ar9485_1_1_baseband_cor
-       {0x0000a3a0, 0xca9228ee},
+@@ -1351,11 +1223,18 @@ static const u32 ar9485_1_1_mac_core[][2
+       {0x000083d0, 0x000301ff},
  };
  
+-static const u32 ar9485_1_1_baseband_core_txfir_coeff_japan_2484[][2] = {
 +static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
-+      /* Addr      allmodes  */
+       /* Addr      allmodes  */
+-      {0x0000a398, 0x00000000},
+-      {0x0000a39c, 0x6f7f0301},
+-      {0x0000a3a0, 0xca9228ee},
 +      {0x00018c00, 0x18013e5e},
 +      {0x00018c04, 0x000801d8},
 +      {0x00018c08, 0x0000080c},
 +      {0x00018c00, 0x1801265e},
 +      {0x00018c04, 0x000801d8},
 +      {0x00018c08, 0x0000080c},
-+};
-+
+ };
  #endif /* INITVALS_9485_H */
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
  
 --- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
 +++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,15 @@
  
  /* AR9462 2.0 */
  
 -static const u32 ar9462_modes_fast_clock_2p0[][3] = {
++#define ar9462_2p0_mac_postamble ar9331_1p1_mac_postamble
++
++#define ar9462_2p0_common_wo_xlna_rx_gain ar9300Common_wo_xlna_rx_gain_table_2p2
++
++#define ar9462_2p0_common_5g_xlna_only_rxgain ar9462_2p0_common_mixed_rx_gain
++
++#define ar9462_2p0_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484
++
 +static const u32 ar9462_2p0_modes_fast_clock[][3] = {
        /* Addr      5G_HT20     5G_HT40   */
        {0x00001030, 0x00000268, 0x000004d0},
        {0x00001070, 0x0000018c, 0x00000318},
-@@ -33,13 +33,6 @@ static const u32 ar9462_modes_fast_clock
+@@ -33,13 +41,6 @@ static const u32 ar9462_modes_fast_clock
        {0x0000a254, 0x00000898, 0x00001130},
  };
  
 -      {0x00018c08, 0x0003780c},
 -};
 -
- static const u32 ar9462_2p0_baseband_postamble[][5] = {
-       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a800d},
-@@ -99,7 +92,7 @@ static const u32 ar9462_2p0_baseband_pos
-       {0x0000b284, 0x00000000, 0x00000000, 0x00000550, 0x00000550},
- };
--static const u32 ar9462_common_rx_gain_table_2p0[][2] = {
-+static const u32 ar9462_2p0_common_rx_gain[][2] = {
-       /* Addr      allmodes  */
-       {0x0000a000, 0x00010000},
-       {0x0000a004, 0x00030002},
-@@ -359,20 +352,13 @@ static const u32 ar9462_common_rx_gain_t
-       {0x0000b1fc, 0x00000196},
- };
--static const u32 ar9462_pciephy_clkreq_disable_L1_2p0[][2] = {
-+static const u32 ar9462_2p0_pciephy_clkreq_disable_L1[][2] = {
-       /* Addr      allmodes  */
-       {0x00018c00, 0x18213ede},
-       {0x00018c04, 0x000801d8},
-       {0x00018c08, 0x0003780c},
- };
--static const u32 ar9462_pciephy_pll_on_clkreq_disable_L1_2p0[][2] = {
+ static const u32 ar9462_2p0_baseband_postamble[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a800d},
+@@ -99,7 +100,7 @@ static const u32 ar9462_2p0_baseband_pos
+       {0x0000b284, 0x00000000, 0x00000000, 0x00000550, 0x00000550},
+ };
+-static const u32 ar9462_common_rx_gain_table_2p0[][2] = {
++static const u32 ar9462_2p0_common_rx_gain[][2] = {
+       /* Addr      allmodes  */
+       {0x0000a000, 0x00010000},
+       {0x0000a004, 0x00030002},
+@@ -359,20 +360,13 @@ static const u32 ar9462_common_rx_gain_t
+       {0x0000b1fc, 0x00000196},
+ };
+-static const u32 ar9462_pciephy_clkreq_disable_L1_2p0[][2] = {
++static const u32 ar9462_2p0_pciephy_clkreq_disable_L1[][2] = {
+       /* Addr      allmodes  */
+       {0x00018c00, 0x18213ede},
+       {0x00018c04, 0x000801d8},
+       {0x00018c08, 0x0003780c},
+ };
+-static const u32 ar9462_pciephy_pll_on_clkreq_disable_L1_2p0[][2] = {
+-      /* Addr      allmodes  */
+-      {0x00018c00, 0x18212ede},
+-      {0x00018c04, 0x000801d8},
+-      {0x00018c08, 0x0003780c},
+-};
+-
+ static const u32 ar9462_2p0_radio_postamble_sys2ant[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x000160ac, 0xa4646c08, 0xa4646c08, 0x24645808, 0x24645808},
+@@ -380,348 +374,81 @@ static const u32 ar9462_2p0_radio_postam
+       {0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+ };
+-static const u32 ar9462_common_wo_xlna_rx_gain_table_2p0[][2] = {
+-      /* Addr      allmodes  */
+-      {0x0000a000, 0x00010000},
+-      {0x0000a004, 0x00030002},
+-      {0x0000a008, 0x00050004},
+-      {0x0000a00c, 0x00810080},
+-      {0x0000a010, 0x00830082},
+-      {0x0000a014, 0x01810180},
+-      {0x0000a018, 0x01830182},
+-      {0x0000a01c, 0x01850184},
+-      {0x0000a020, 0x01890188},
+-      {0x0000a024, 0x018b018a},
+-      {0x0000a028, 0x018d018c},
+-      {0x0000a02c, 0x03820190},
+-      {0x0000a030, 0x03840383},
+-      {0x0000a034, 0x03880385},
+-      {0x0000a038, 0x038a0389},
+-      {0x0000a03c, 0x038c038b},
+-      {0x0000a040, 0x0390038d},
+-      {0x0000a044, 0x03920391},
+-      {0x0000a048, 0x03940393},
+-      {0x0000a04c, 0x03960395},
+-      {0x0000a050, 0x00000000},
+-      {0x0000a054, 0x00000000},
+-      {0x0000a058, 0x00000000},
+-      {0x0000a05c, 0x00000000},
+-      {0x0000a060, 0x00000000},
+-      {0x0000a064, 0x00000000},
+-      {0x0000a068, 0x00000000},
+-      {0x0000a06c, 0x00000000},
+-      {0x0000a070, 0x00000000},
+-      {0x0000a074, 0x00000000},
+-      {0x0000a078, 0x00000000},
+-      {0x0000a07c, 0x00000000},
+-      {0x0000a080, 0x29292929},
+-      {0x0000a084, 0x29292929},
+-      {0x0000a088, 0x29292929},
+-      {0x0000a08c, 0x29292929},
+-      {0x0000a090, 0x22292929},
+-      {0x0000a094, 0x1d1d2222},
+-      {0x0000a098, 0x0c111117},
+-      {0x0000a09c, 0x00030303},
+-      {0x0000a0a0, 0x00000000},
+-      {0x0000a0a4, 0x00000000},
+-      {0x0000a0a8, 0x00000000},
+-      {0x0000a0ac, 0x00000000},
+-      {0x0000a0b0, 0x00000000},
+-      {0x0000a0b4, 0x00000000},
+-      {0x0000a0b8, 0x00000000},
+-      {0x0000a0bc, 0x00000000},
+-      {0x0000a0c0, 0x001f0000},
+-      {0x0000a0c4, 0x01000101},
+-      {0x0000a0c8, 0x011e011f},
+-      {0x0000a0cc, 0x011c011d},
+-      {0x0000a0d0, 0x02030204},
+-      {0x0000a0d4, 0x02010202},
+-      {0x0000a0d8, 0x021f0200},
+-      {0x0000a0dc, 0x0302021e},
+-      {0x0000a0e0, 0x03000301},
+-      {0x0000a0e4, 0x031e031f},
+-      {0x0000a0e8, 0x0402031d},
+-      {0x0000a0ec, 0x04000401},
+-      {0x0000a0f0, 0x041e041f},
+-      {0x0000a0f4, 0x0502041d},
+-      {0x0000a0f8, 0x05000501},
+-      {0x0000a0fc, 0x051e051f},
+-      {0x0000a100, 0x06010602},
+-      {0x0000a104, 0x061f0600},
+-      {0x0000a108, 0x061d061e},
+-      {0x0000a10c, 0x07020703},
+-      {0x0000a110, 0x07000701},
+-      {0x0000a114, 0x00000000},
+-      {0x0000a118, 0x00000000},
+-      {0x0000a11c, 0x00000000},
+-      {0x0000a120, 0x00000000},
+-      {0x0000a124, 0x00000000},
+-      {0x0000a128, 0x00000000},
+-      {0x0000a12c, 0x00000000},
+-      {0x0000a130, 0x00000000},
+-      {0x0000a134, 0x00000000},
+-      {0x0000a138, 0x00000000},
+-      {0x0000a13c, 0x00000000},
+-      {0x0000a140, 0x001f0000},
+-      {0x0000a144, 0x01000101},
+-      {0x0000a148, 0x011e011f},
+-      {0x0000a14c, 0x011c011d},
+-      {0x0000a150, 0x02030204},
+-      {0x0000a154, 0x02010202},
+-      {0x0000a158, 0x021f0200},
+-      {0x0000a15c, 0x0302021e},
+-      {0x0000a160, 0x03000301},
+-      {0x0000a164, 0x031e031f},
+-      {0x0000a168, 0x0402031d},
+-      {0x0000a16c, 0x04000401},
+-      {0x0000a170, 0x041e041f},
+-      {0x0000a174, 0x0502041d},
+-      {0x0000a178, 0x05000501},
+-      {0x0000a17c, 0x051e051f},
+-      {0x0000a180, 0x06010602},
+-      {0x0000a184, 0x061f0600},
+-      {0x0000a188, 0x061d061e},
+-      {0x0000a18c, 0x07020703},
+-      {0x0000a190, 0x07000701},
+-      {0x0000a194, 0x00000000},
+-      {0x0000a198, 0x00000000},
+-      {0x0000a19c, 0x00000000},
+-      {0x0000a1a0, 0x00000000},
+-      {0x0000a1a4, 0x00000000},
+-      {0x0000a1a8, 0x00000000},
+-      {0x0000a1ac, 0x00000000},
+-      {0x0000a1b0, 0x00000000},
+-      {0x0000a1b4, 0x00000000},
+-      {0x0000a1b8, 0x00000000},
+-      {0x0000a1bc, 0x00000000},
+-      {0x0000a1c0, 0x00000000},
+-      {0x0000a1c4, 0x00000000},
+-      {0x0000a1c8, 0x00000000},
+-      {0x0000a1cc, 0x00000000},
+-      {0x0000a1d0, 0x00000000},
+-      {0x0000a1d4, 0x00000000},
+-      {0x0000a1d8, 0x00000000},
+-      {0x0000a1dc, 0x00000000},
+-      {0x0000a1e0, 0x00000000},
+-      {0x0000a1e4, 0x00000000},
+-      {0x0000a1e8, 0x00000000},
+-      {0x0000a1ec, 0x00000000},
+-      {0x0000a1f0, 0x00000396},
+-      {0x0000a1f4, 0x00000396},
+-      {0x0000a1f8, 0x00000396},
+-      {0x0000a1fc, 0x00000196},
+-      {0x0000b000, 0x00010000},
+-      {0x0000b004, 0x00030002},
+-      {0x0000b008, 0x00050004},
+-      {0x0000b00c, 0x00810080},
+-      {0x0000b010, 0x00830082},
+-      {0x0000b014, 0x01810180},
+-      {0x0000b018, 0x01830182},
+-      {0x0000b01c, 0x01850184},
+-      {0x0000b020, 0x02810280},
+-      {0x0000b024, 0x02830282},
+-      {0x0000b028, 0x02850284},
+-      {0x0000b02c, 0x02890288},
+-      {0x0000b030, 0x028b028a},
+-      {0x0000b034, 0x0388028c},
+-      {0x0000b038, 0x038a0389},
+-      {0x0000b03c, 0x038c038b},
+-      {0x0000b040, 0x0390038d},
+-      {0x0000b044, 0x03920391},
+-      {0x0000b048, 0x03940393},
+-      {0x0000b04c, 0x03960395},
+-      {0x0000b050, 0x00000000},
+-      {0x0000b054, 0x00000000},
+-      {0x0000b058, 0x00000000},
+-      {0x0000b05c, 0x00000000},
+-      {0x0000b060, 0x00000000},
+-      {0x0000b064, 0x00000000},
+-      {0x0000b068, 0x00000000},
+-      {0x0000b06c, 0x00000000},
+-      {0x0000b070, 0x00000000},
+-      {0x0000b074, 0x00000000},
+-      {0x0000b078, 0x00000000},
+-      {0x0000b07c, 0x00000000},
+-      {0x0000b080, 0x32323232},
+-      {0x0000b084, 0x2f2f3232},
+-      {0x0000b088, 0x23282a2d},
+-      {0x0000b08c, 0x1c1e2123},
+-      {0x0000b090, 0x14171919},
+-      {0x0000b094, 0x0e0e1214},
+-      {0x0000b098, 0x03050707},
+-      {0x0000b09c, 0x00030303},
+-      {0x0000b0a0, 0x00000000},
+-      {0x0000b0a4, 0x00000000},
+-      {0x0000b0a8, 0x00000000},
+-      {0x0000b0ac, 0x00000000},
+-      {0x0000b0b0, 0x00000000},
+-      {0x0000b0b4, 0x00000000},
+-      {0x0000b0b8, 0x00000000},
+-      {0x0000b0bc, 0x00000000},
+-      {0x0000b0c0, 0x003f0020},
+-      {0x0000b0c4, 0x00400041},
+-      {0x0000b0c8, 0x0140005f},
+-      {0x0000b0cc, 0x0160015f},
+-      {0x0000b0d0, 0x017e017f},
+-      {0x0000b0d4, 0x02410242},
+-      {0x0000b0d8, 0x025f0240},
+-      {0x0000b0dc, 0x027f0260},
+-      {0x0000b0e0, 0x0341027e},
+-      {0x0000b0e4, 0x035f0340},
+-      {0x0000b0e8, 0x037f0360},
+-      {0x0000b0ec, 0x04400441},
+-      {0x0000b0f0, 0x0460045f},
+-      {0x0000b0f4, 0x0541047f},
+-      {0x0000b0f8, 0x055f0540},
+-      {0x0000b0fc, 0x057f0560},
+-      {0x0000b100, 0x06400641},
+-      {0x0000b104, 0x0660065f},
+-      {0x0000b108, 0x067e067f},
+-      {0x0000b10c, 0x07410742},
+-      {0x0000b110, 0x075f0740},
+-      {0x0000b114, 0x077f0760},
+-      {0x0000b118, 0x07800781},
+-      {0x0000b11c, 0x07a0079f},
+-      {0x0000b120, 0x07c107bf},
+-      {0x0000b124, 0x000007c0},
+-      {0x0000b128, 0x00000000},
+-      {0x0000b12c, 0x00000000},
+-      {0x0000b130, 0x00000000},
+-      {0x0000b134, 0x00000000},
+-      {0x0000b138, 0x00000000},
+-      {0x0000b13c, 0x00000000},
+-      {0x0000b140, 0x003f0020},
+-      {0x0000b144, 0x00400041},
+-      {0x0000b148, 0x0140005f},
+-      {0x0000b14c, 0x0160015f},
+-      {0x0000b150, 0x017e017f},
+-      {0x0000b154, 0x02410242},
+-      {0x0000b158, 0x025f0240},
+-      {0x0000b15c, 0x027f0260},
+-      {0x0000b160, 0x0341027e},
+-      {0x0000b164, 0x035f0340},
+-      {0x0000b168, 0x037f0360},
+-      {0x0000b16c, 0x04400441},
+-      {0x0000b170, 0x0460045f},
+-      {0x0000b174, 0x0541047f},
+-      {0x0000b178, 0x055f0540},
+-      {0x0000b17c, 0x057f0560},
+-      {0x0000b180, 0x06400641},
+-      {0x0000b184, 0x0660065f},
+-      {0x0000b188, 0x067e067f},
+-      {0x0000b18c, 0x07410742},
+-      {0x0000b190, 0x075f0740},
+-      {0x0000b194, 0x077f0760},
+-      {0x0000b198, 0x07800781},
+-      {0x0000b19c, 0x07a0079f},
+-      {0x0000b1a0, 0x07c107bf},
+-      {0x0000b1a4, 0x000007c0},
+-      {0x0000b1a8, 0x00000000},
+-      {0x0000b1ac, 0x00000000},
+-      {0x0000b1b0, 0x00000000},
+-      {0x0000b1b4, 0x00000000},
+-      {0x0000b1b8, 0x00000000},
+-      {0x0000b1bc, 0x00000000},
+-      {0x0000b1c0, 0x00000000},
+-      {0x0000b1c4, 0x00000000},
+-      {0x0000b1c8, 0x00000000},
+-      {0x0000b1cc, 0x00000000},
+-      {0x0000b1d0, 0x00000000},
+-      {0x0000b1d4, 0x00000000},
+-      {0x0000b1d8, 0x00000000},
+-      {0x0000b1dc, 0x00000000},
+-      {0x0000b1e0, 0x00000000},
+-      {0x0000b1e4, 0x00000000},
+-      {0x0000b1e8, 0x00000000},
+-      {0x0000b1ec, 0x00000000},
+-      {0x0000b1f0, 0x00000396},
+-      {0x0000b1f4, 0x00000396},
+-      {0x0000b1f8, 0x00000396},
+-      {0x0000b1fc, 0x00000196},
+-};
+-
+-static const u32 ar9462_2p0_baseband_core_txfir_coeff_japan_2484[][2] = {
 -      /* Addr      allmodes  */
--      {0x00018c00, 0x18212ede},
--      {0x00018c04, 0x000801d8},
--      {0x00018c08, 0x0003780c},
+-      {0x0000a398, 0x00000000},
+-      {0x0000a39c, 0x6f7f0301},
+-      {0x0000a3a0, 0xca9228ee},
 -};
 -
- static const u32 ar9462_2p0_radio_postamble_sys2ant[][5] = {
-       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-       {0x000160ac, 0xa4646c08, 0xa4646c08, 0x24645808, 0x24645808},
-@@ -380,7 +366,7 @@ static const u32 ar9462_2p0_radio_postam
-       {0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
- };
--static const u32 ar9462_common_wo_xlna_rx_gain_table_2p0[][2] = {
-+static const u32 ar9462_2p0_common_wo_xlna_rx_gain[][2] = {
-       /* Addr      allmodes  */
-       {0x0000a000, 0x00010000},
-       {0x0000a004, 0x00030002},
-@@ -647,7 +633,7 @@ static const u32 ar9462_2p0_baseband_cor
-       {0x0000a3a0, 0xca9228ee},
- };
 -static const u32 ar9462_modes_low_ob_db_tx_gain_table_2p0[][5] = {
+-      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
+-      {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+-      {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+-      {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+-      {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+-      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+-      {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
+-      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
+-      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
+-      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
+-      {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
+-      {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
+-      {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
+-      {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
+-      {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
+-      {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
+-      {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
+-      {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
+-      {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
+-      {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
+-      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
+-      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
+-      {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
+-      {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
+-      {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
+-      {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
+-      {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
+-      {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
+-      {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
+-      {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
+-      {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
+-      {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
+-      {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
+-      {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
+-      {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+-      {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
+-      {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
+-      {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+-      {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+-      {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+-      {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+-      {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+-      {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+-      {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+-      {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+-      {0x00016044, 0x012482d4, 0x012482d4, 0x012482d4, 0x012482d4},
+-      {0x00016048, 0x64992060, 0x64992060, 0x64992060, 0x64992060},
+-      {0x00016054, 0x6db60000, 0x6db60000, 0x6db60000, 0x6db60000},
+-      {0x00016444, 0x012482d4, 0x012482d4, 0x012482d4, 0x012482d4},
+-      {0x00016448, 0x64992000, 0x64992000, 0x64992000, 0x64992000},
+-      {0x00016454, 0x6db60000, 0x6db60000, 0x6db60000, 0x6db60000},
+-};
+-
+-static const u32 ar9462_2p0_soc_postamble[][5] = {
+-      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x00007010, 0x00000033, 0x00000033, 0x00000033, 0x00000033},
+-};
+-
+-static const u32 ar9462_2p0_baseband_core[][2] = {
 +static const u32 ar9462_2p0_modes_low_ob_db_tx_gain[][5] = {
-       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-       {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
-       {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-@@ -879,7 +865,7 @@ static const u32 ar9462_2p0_radio_postam
++      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
++      {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
++      {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++      {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++      {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
++      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
++      {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
++      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
++      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
++      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
++      {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
++      {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
++      {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
++      {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
++      {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
++      {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
++      {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
++      {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
++      {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
++      {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
++      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
++      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
++      {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
++      {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
++      {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
++      {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
++      {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
++      {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
++      {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
++      {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
++      {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
++      {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
++      {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
++      {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
++      {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
++      {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
++      {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
++      {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
++      {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
++      {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
++      {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
++      {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
++      {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
++      {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
++      {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++      {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++      {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++      {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++      {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++      {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++      {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
++      {0x00016044, 0x012482d4, 0x012482d4, 0x012482d4, 0x012482d4},
++      {0x00016048, 0x64992060, 0x64992060, 0x64992060, 0x64992060},
++      {0x00016054, 0x6db60000, 0x6db60000, 0x6db60000, 0x6db60000},
++      {0x00016444, 0x012482d4, 0x012482d4, 0x012482d4, 0x012482d4},
++      {0x00016448, 0x64992000, 0x64992000, 0x64992000, 0x64992000},
++      {0x00016454, 0x6db60000, 0x6db60000, 0x6db60000, 0x6db60000},
++};
++
++static const u32 ar9462_2p0_soc_postamble[][5] = {
++      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
++      {0x00007010, 0x00000033, 0x00000033, 0x00000033, 0x00000033},
++};
++
++static const u32 ar9462_2p0_baseband_core[][2] = {
+       /* Addr      allmodes  */
+       {0x00009800, 0xafe68e30},
+       {0x00009804, 0xfd14e000},
+@@ -879,7 +606,7 @@ static const u32 ar9462_2p0_radio_postam
        {0x0001650c, 0x48000000, 0x40000000, 0x40000000, 0x40000000},
  };
  
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
        {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
        {0x0000a2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
-@@ -942,7 +928,7 @@ static const u32 ar9462_modes_mix_ob_db_
+@@ -942,7 +669,7 @@ static const u32 ar9462_modes_mix_ob_db_
        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
  };
  
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
        {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
        {0x0000a2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
-@@ -1252,7 +1238,7 @@ static const u32 ar9462_2p0_mac_postambl
-       {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
+@@ -1240,19 +967,7 @@ static const u32 ar9462_2p0_mac_core[][2
+       {0x000083d0, 0x000301ff},
  };
  
+-static const u32 ar9462_2p0_mac_postamble[][5] = {
+-      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
+-      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
+-      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
+-      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
+-      {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
+-      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
+-      {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
+-      {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
+-};
+-
 -static const u32 ar9462_common_mixed_rx_gain_table_2p0[][2] = {
 +static const u32 ar9462_2p0_common_mixed_rx_gain[][2] = {
        /* Addr      allmodes  */
        {0x0000a000, 0x00010000},
        {0x0000a004, 0x00030002},
-@@ -1517,7 +1503,7 @@ static const u32 ar9462_2p0_baseband_pos
+@@ -1517,266 +1232,6 @@ static const u32 ar9462_2p0_baseband_pos
        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcfd5c782, 0xcfd5c282},
  };
  
 -static const u32 ar9462_2p0_5g_xlna_only_rxgain[][2] = {
-+static const u32 ar9462_2p0_common_5g_xlna_only_rxgain[][2] = {
+-      /* Addr      allmodes  */
+-      {0x0000a000, 0x00010000},
+-      {0x0000a004, 0x00030002},
+-      {0x0000a008, 0x00050004},
+-      {0x0000a00c, 0x00810080},
+-      {0x0000a010, 0x00830082},
+-      {0x0000a014, 0x01810180},
+-      {0x0000a018, 0x01830182},
+-      {0x0000a01c, 0x01850184},
+-      {0x0000a020, 0x01890188},
+-      {0x0000a024, 0x018b018a},
+-      {0x0000a028, 0x018d018c},
+-      {0x0000a02c, 0x03820190},
+-      {0x0000a030, 0x03840383},
+-      {0x0000a034, 0x03880385},
+-      {0x0000a038, 0x038a0389},
+-      {0x0000a03c, 0x038c038b},
+-      {0x0000a040, 0x0390038d},
+-      {0x0000a044, 0x03920391},
+-      {0x0000a048, 0x03940393},
+-      {0x0000a04c, 0x03960395},
+-      {0x0000a050, 0x00000000},
+-      {0x0000a054, 0x00000000},
+-      {0x0000a058, 0x00000000},
+-      {0x0000a05c, 0x00000000},
+-      {0x0000a060, 0x00000000},
+-      {0x0000a064, 0x00000000},
+-      {0x0000a068, 0x00000000},
+-      {0x0000a06c, 0x00000000},
+-      {0x0000a070, 0x00000000},
+-      {0x0000a074, 0x00000000},
+-      {0x0000a078, 0x00000000},
+-      {0x0000a07c, 0x00000000},
+-      {0x0000a080, 0x29292929},
+-      {0x0000a084, 0x29292929},
+-      {0x0000a088, 0x29292929},
+-      {0x0000a08c, 0x29292929},
+-      {0x0000a090, 0x22292929},
+-      {0x0000a094, 0x1d1d2222},
+-      {0x0000a098, 0x0c111117},
+-      {0x0000a09c, 0x00030303},
+-      {0x0000a0a0, 0x00000000},
+-      {0x0000a0a4, 0x00000000},
+-      {0x0000a0a8, 0x00000000},
+-      {0x0000a0ac, 0x00000000},
+-      {0x0000a0b0, 0x00000000},
+-      {0x0000a0b4, 0x00000000},
+-      {0x0000a0b8, 0x00000000},
+-      {0x0000a0bc, 0x00000000},
+-      {0x0000a0c0, 0x001f0000},
+-      {0x0000a0c4, 0x01000101},
+-      {0x0000a0c8, 0x011e011f},
+-      {0x0000a0cc, 0x011c011d},
+-      {0x0000a0d0, 0x02030204},
+-      {0x0000a0d4, 0x02010202},
+-      {0x0000a0d8, 0x021f0200},
+-      {0x0000a0dc, 0x0302021e},
+-      {0x0000a0e0, 0x03000301},
+-      {0x0000a0e4, 0x031e031f},
+-      {0x0000a0e8, 0x0402031d},
+-      {0x0000a0ec, 0x04000401},
+-      {0x0000a0f0, 0x041e041f},
+-      {0x0000a0f4, 0x0502041d},
+-      {0x0000a0f8, 0x05000501},
+-      {0x0000a0fc, 0x051e051f},
+-      {0x0000a100, 0x06010602},
+-      {0x0000a104, 0x061f0600},
+-      {0x0000a108, 0x061d061e},
+-      {0x0000a10c, 0x07020703},
+-      {0x0000a110, 0x07000701},
+-      {0x0000a114, 0x00000000},
+-      {0x0000a118, 0x00000000},
+-      {0x0000a11c, 0x00000000},
+-      {0x0000a120, 0x00000000},
+-      {0x0000a124, 0x00000000},
+-      {0x0000a128, 0x00000000},
+-      {0x0000a12c, 0x00000000},
+-      {0x0000a130, 0x00000000},
+-      {0x0000a134, 0x00000000},
+-      {0x0000a138, 0x00000000},
+-      {0x0000a13c, 0x00000000},
+-      {0x0000a140, 0x001f0000},
+-      {0x0000a144, 0x01000101},
+-      {0x0000a148, 0x011e011f},
+-      {0x0000a14c, 0x011c011d},
+-      {0x0000a150, 0x02030204},
+-      {0x0000a154, 0x02010202},
+-      {0x0000a158, 0x021f0200},
+-      {0x0000a15c, 0x0302021e},
+-      {0x0000a160, 0x03000301},
+-      {0x0000a164, 0x031e031f},
+-      {0x0000a168, 0x0402031d},
+-      {0x0000a16c, 0x04000401},
+-      {0x0000a170, 0x041e041f},
+-      {0x0000a174, 0x0502041d},
+-      {0x0000a178, 0x05000501},
+-      {0x0000a17c, 0x051e051f},
+-      {0x0000a180, 0x06010602},
+-      {0x0000a184, 0x061f0600},
+-      {0x0000a188, 0x061d061e},
+-      {0x0000a18c, 0x07020703},
+-      {0x0000a190, 0x07000701},
+-      {0x0000a194, 0x00000000},
+-      {0x0000a198, 0x00000000},
+-      {0x0000a19c, 0x00000000},
+-      {0x0000a1a0, 0x00000000},
+-      {0x0000a1a4, 0x00000000},
+-      {0x0000a1a8, 0x00000000},
+-      {0x0000a1ac, 0x00000000},
+-      {0x0000a1b0, 0x00000000},
+-      {0x0000a1b4, 0x00000000},
+-      {0x0000a1b8, 0x00000000},
+-      {0x0000a1bc, 0x00000000},
+-      {0x0000a1c0, 0x00000000},
+-      {0x0000a1c4, 0x00000000},
+-      {0x0000a1c8, 0x00000000},
+-      {0x0000a1cc, 0x00000000},
+-      {0x0000a1d0, 0x00000000},
+-      {0x0000a1d4, 0x00000000},
+-      {0x0000a1d8, 0x00000000},
+-      {0x0000a1dc, 0x00000000},
+-      {0x0000a1e0, 0x00000000},
+-      {0x0000a1e4, 0x00000000},
+-      {0x0000a1e8, 0x00000000},
+-      {0x0000a1ec, 0x00000000},
+-      {0x0000a1f0, 0x00000396},
+-      {0x0000a1f4, 0x00000396},
+-      {0x0000a1f8, 0x00000396},
+-      {0x0000a1fc, 0x00000196},
+-      {0x0000b000, 0x00010000},
+-      {0x0000b004, 0x00030002},
+-      {0x0000b008, 0x00050004},
+-      {0x0000b00c, 0x00810080},
+-      {0x0000b010, 0x00830082},
+-      {0x0000b014, 0x01810180},
+-      {0x0000b018, 0x01830182},
+-      {0x0000b01c, 0x01850184},
+-      {0x0000b020, 0x02810280},
+-      {0x0000b024, 0x02830282},
+-      {0x0000b028, 0x02850284},
+-      {0x0000b02c, 0x02890288},
+-      {0x0000b030, 0x028b028a},
+-      {0x0000b034, 0x0388028c},
+-      {0x0000b038, 0x038a0389},
+-      {0x0000b03c, 0x038c038b},
+-      {0x0000b040, 0x0390038d},
+-      {0x0000b044, 0x03920391},
+-      {0x0000b048, 0x03940393},
+-      {0x0000b04c, 0x03960395},
+-      {0x0000b050, 0x00000000},
+-      {0x0000b054, 0x00000000},
+-      {0x0000b058, 0x00000000},
+-      {0x0000b05c, 0x00000000},
+-      {0x0000b060, 0x00000000},
+-      {0x0000b064, 0x00000000},
+-      {0x0000b068, 0x00000000},
+-      {0x0000b06c, 0x00000000},
+-      {0x0000b070, 0x00000000},
+-      {0x0000b074, 0x00000000},
+-      {0x0000b078, 0x00000000},
+-      {0x0000b07c, 0x00000000},
+-      {0x0000b080, 0x2a2d2f32},
+-      {0x0000b084, 0x21232328},
+-      {0x0000b088, 0x19191c1e},
+-      {0x0000b08c, 0x12141417},
+-      {0x0000b090, 0x07070e0e},
+-      {0x0000b094, 0x03030305},
+-      {0x0000b098, 0x00000003},
+-      {0x0000b09c, 0x00000000},
+-      {0x0000b0a0, 0x00000000},
+-      {0x0000b0a4, 0x00000000},
+-      {0x0000b0a8, 0x00000000},
+-      {0x0000b0ac, 0x00000000},
+-      {0x0000b0b0, 0x00000000},
+-      {0x0000b0b4, 0x00000000},
+-      {0x0000b0b8, 0x00000000},
+-      {0x0000b0bc, 0x00000000},
+-      {0x0000b0c0, 0x003f0020},
+-      {0x0000b0c4, 0x00400041},
+-      {0x0000b0c8, 0x0140005f},
+-      {0x0000b0cc, 0x0160015f},
+-      {0x0000b0d0, 0x017e017f},
+-      {0x0000b0d4, 0x02410242},
+-      {0x0000b0d8, 0x025f0240},
+-      {0x0000b0dc, 0x027f0260},
+-      {0x0000b0e0, 0x0341027e},
+-      {0x0000b0e4, 0x035f0340},
+-      {0x0000b0e8, 0x037f0360},
+-      {0x0000b0ec, 0x04400441},
+-      {0x0000b0f0, 0x0460045f},
+-      {0x0000b0f4, 0x0541047f},
+-      {0x0000b0f8, 0x055f0540},
+-      {0x0000b0fc, 0x057f0560},
+-      {0x0000b100, 0x06400641},
+-      {0x0000b104, 0x0660065f},
+-      {0x0000b108, 0x067e067f},
+-      {0x0000b10c, 0x07410742},
+-      {0x0000b110, 0x075f0740},
+-      {0x0000b114, 0x077f0760},
+-      {0x0000b118, 0x07800781},
+-      {0x0000b11c, 0x07a0079f},
+-      {0x0000b120, 0x07c107bf},
+-      {0x0000b124, 0x000007c0},
+-      {0x0000b128, 0x00000000},
+-      {0x0000b12c, 0x00000000},
+-      {0x0000b130, 0x00000000},
+-      {0x0000b134, 0x00000000},
+-      {0x0000b138, 0x00000000},
+-      {0x0000b13c, 0x00000000},
+-      {0x0000b140, 0x003f0020},
+-      {0x0000b144, 0x00400041},
+-      {0x0000b148, 0x0140005f},
+-      {0x0000b14c, 0x0160015f},
+-      {0x0000b150, 0x017e017f},
+-      {0x0000b154, 0x02410242},
+-      {0x0000b158, 0x025f0240},
+-      {0x0000b15c, 0x027f0260},
+-      {0x0000b160, 0x0341027e},
+-      {0x0000b164, 0x035f0340},
+-      {0x0000b168, 0x037f0360},
+-      {0x0000b16c, 0x04400441},
+-      {0x0000b170, 0x0460045f},
+-      {0x0000b174, 0x0541047f},
+-      {0x0000b178, 0x055f0540},
+-      {0x0000b17c, 0x057f0560},
+-      {0x0000b180, 0x06400641},
+-      {0x0000b184, 0x0660065f},
+-      {0x0000b188, 0x067e067f},
+-      {0x0000b18c, 0x07410742},
+-      {0x0000b190, 0x075f0740},
+-      {0x0000b194, 0x077f0760},
+-      {0x0000b198, 0x07800781},
+-      {0x0000b19c, 0x07a0079f},
+-      {0x0000b1a0, 0x07c107bf},
+-      {0x0000b1a4, 0x000007c0},
+-      {0x0000b1a8, 0x00000000},
+-      {0x0000b1ac, 0x00000000},
+-      {0x0000b1b0, 0x00000000},
+-      {0x0000b1b4, 0x00000000},
+-      {0x0000b1b8, 0x00000000},
+-      {0x0000b1bc, 0x00000000},
+-      {0x0000b1c0, 0x00000000},
+-      {0x0000b1c4, 0x00000000},
+-      {0x0000b1c8, 0x00000000},
+-      {0x0000b1cc, 0x00000000},
+-      {0x0000b1d0, 0x00000000},
+-      {0x0000b1d4, 0x00000000},
+-      {0x0000b1d8, 0x00000000},
+-      {0x0000b1dc, 0x00000000},
+-      {0x0000b1e0, 0x00000000},
+-      {0x0000b1e4, 0x00000000},
+-      {0x0000b1e8, 0x00000000},
+-      {0x0000b1ec, 0x00000000},
+-      {0x0000b1f0, 0x00000396},
+-      {0x0000b1f4, 0x00000396},
+-      {0x0000b1f8, 0x00000396},
+-      {0x0000b1fc, 0x00000196},
+-};
+-
+ static const u32 ar9462_2p0_baseband_core_mix_rxgain[][2] = {
        /* Addr      allmodes  */
-       {0x0000a000, 0x00010000},
-       {0x0000a004, 0x00030002},
+       {0x00009fd0, 0x0a2d6b93},
 --- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+@@ -303,7 +303,7 @@ static const u32 ar9300_2p2_mac_postambl
+       {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
+       {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
+       {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
+-      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
++      {0x00008120, 0x18f04800, 0x18f04800, 0x18f04810, 0x18f04810},
+       {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
+       {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
+ };
 @@ -352,7 +352,7 @@ static const u32 ar9300_2p2_baseband_pos
        {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
        {0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
        {0x0000a3f8, 0x0c9bd380},
        {0x0000a3fc, 0x000f0f01},
        {0x0000a400, 0x8fa91f01},
+@@ -534,107 +534,107 @@ static const u32 ar9300_2p2_baseband_cor
+ static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+-      {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+-      {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
++      {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
++      {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+       {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+-      {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
+-      {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
+-      {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
+-      {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
+-      {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
+-      {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
+-      {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
+-      {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
+-      {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
+-      {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
+-      {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
+-      {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
+-      {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
+-      {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
+-      {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
+-      {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
+-      {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
+-      {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
+-      {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
+-      {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
+-      {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
+-      {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
+-      {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
+-      {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
+-      {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
+-      {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
+-      {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+-      {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+-      {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+-      {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+-      {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+-      {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+-      {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+-      {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
+-      {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
+-      {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
+-      {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
+-      {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
+-      {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
+-      {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
+-      {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
+-      {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
+-      {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
+-      {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
+-      {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
+-      {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
+-      {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
+-      {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
+-      {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
+-      {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
+-      {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
+-      {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
+-      {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
+-      {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
+-      {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
+-      {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
+-      {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
+-      {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
+-      {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+-      {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+-      {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+-      {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+-      {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+-      {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+-      {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
++      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
++      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
++      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
++      {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
++      {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
++      {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
++      {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
++      {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
++      {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
++      {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
++      {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
++      {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
++      {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
++      {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
++      {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
++      {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
++      {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
++      {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
++      {0x0000a54c, 0x5e08442e, 0x5e08442e, 0x47001a83, 0x47001a83},
++      {0x0000a550, 0x620a4431, 0x620a4431, 0x4a001c84, 0x4a001c84},
++      {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
++      {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
++      {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
++      {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
++      {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
++      {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
++      {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
++      {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
++      {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
++      {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
++      {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
++      {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
++      {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
++      {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
++      {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
++      {0x0000a590, 0x15800028, 0x15800028, 0x0f800202, 0x0f800202},
++      {0x0000a594, 0x1b80002b, 0x1b80002b, 0x12800400, 0x12800400},
++      {0x0000a598, 0x1f820028, 0x1f820028, 0x16800402, 0x16800402},
++      {0x0000a59c, 0x2582002b, 0x2582002b, 0x19800404, 0x19800404},
++      {0x0000a5a0, 0x2a84002a, 0x2a84002a, 0x1c800603, 0x1c800603},
++      {0x0000a5a4, 0x2e86002a, 0x2e86002a, 0x21800a02, 0x21800a02},
++      {0x0000a5a8, 0x3382202d, 0x3382202d, 0x25800a04, 0x25800a04},
++      {0x0000a5ac, 0x3884202c, 0x3884202c, 0x28800a20, 0x28800a20},
++      {0x0000a5b0, 0x3c86202c, 0x3c86202c, 0x2c800e20, 0x2c800e20},
++      {0x0000a5b4, 0x4188202d, 0x4188202d, 0x30800e22, 0x30800e22},
++      {0x0000a5b8, 0x4586402d, 0x4586402d, 0x34800e24, 0x34800e24},
++      {0x0000a5bc, 0x4986222d, 0x4986222d, 0x38801640, 0x38801640},
++      {0x0000a5c0, 0x4d862231, 0x4d862231, 0x3c801660, 0x3c801660},
++      {0x0000a5c4, 0x50882231, 0x50882231, 0x3f801861, 0x3f801861},
++      {0x0000a5c8, 0x5688422e, 0x5688422e, 0x43801a81, 0x43801a81},
++      {0x0000a5cc, 0x5e88442e, 0x5e88442e, 0x47801a83, 0x47801a83},
++      {0x0000a5d0, 0x628a4431, 0x628a4431, 0x4a801c84, 0x4a801c84},
++      {0x0000a5d4, 0x648a4432, 0x648a4432, 0x4e801ce3, 0x4e801ce3},
++      {0x0000a5d8, 0x688a4434, 0x688a4434, 0x52801ce5, 0x52801ce5},
++      {0x0000a5dc, 0x6c8a6434, 0x6c8a6434, 0x56801ce9, 0x56801ce9},
++      {0x0000a5e0, 0x6f8a6633, 0x6f8a6633, 0x5a801ceb, 0x5a801ceb},
++      {0x0000a5e4, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
++      {0x0000a5e8, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
++      {0x0000a5ec, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
++      {0x0000a5f0, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
++      {0x0000a5f4, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
++      {0x0000a5f8, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
++      {0x0000a5fc, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
+       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
+-      {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
+-      {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
+-      {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
+-      {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
+-      {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
+-      {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
+-      {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+-      {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+-      {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+-      {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+-      {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+-      {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+-      {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+-      {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
++      {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
++      {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
++      {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
++      {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
++      {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
++      {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
++      {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
++      {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
++      {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
++      {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
++      {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
++      {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
++      {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
++      {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
++      {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
++      {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+       {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+-      {0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+-      {0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+-      {0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
++      {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
++      {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+       {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+       {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+-      {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
++      {0x00016048, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
+       {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+       {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+-      {0x00016448, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
++      {0x00016448, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
+       {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+       {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+-      {0x00016848, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
++      {0x00016848, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
+       {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+ };
 @@ -644,7 +644,7 @@ static const u32 ar9300Modes_high_ob_db_
        {0x0000a2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
        {0x0000a2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
        {0x00008250, 0x00000000},
        {0x00008254, 0x00000000},
        {0x00008258, 0x00000000},
-@@ -1726,14 +1726,14 @@ static const u32 ar9300PciePhy_pll_on_cl
+@@ -1726,16 +1726,30 @@ static const u32 ar9300PciePhy_pll_on_cl
  
  static const u32 ar9300PciePhy_clkreq_enable_L1_2p2[][2] = {
        /* Addr      allmodes  */
        {0x00004040, 0x0008003b},
        {0x00004044, 0x00000000},
  };
++static const u32 ar9300_2p2_baseband_core_txfir_coeff_japan_2484[][2] = {
++      /* Addr      allmodes  */
++      {0x0000a398, 0x00000000},
++      {0x0000a39c, 0x6f7f0301},
++      {0x0000a3a0, 0xca9228ee},
++};
++
++static const u32 ar9300_2p2_baseband_postamble_dfs_channel[][3] = {
++      /* Addr      5G          2G        */
++      {0x00009824, 0x5ac668d0, 0x5ac668d0},
++      {0x00009e0c, 0x6d4000e2, 0x6d4000e2},
++      {0x00009e14, 0x37b9625e, 0x37b9625e},
++};
++
+ #endif /* INITVALS_9003_2P2_H */
 --- /dev/null
 +++ b/drivers/net/wireless/ath/ath9k/ar9565_1p1_initvals.h
 @@ -0,0 +1,64 @@
 +
  #define ar9580_1p0_modes_fast_clock ar9300Modes_fast_clock_2p2
  
-+#define ar9580_1p0_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484
++#define ar9580_1p0_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484
 +
  static const u32 ar9580_1p0_radio_postamble[][5] = {
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
        {0x00016940, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
  };
  
-@@ -44,9 +60,9 @@ static const u32 ar9580_1p0_baseband_cor
-       {0x00009814, 0x3280c00a},
-       {0x00009818, 0x00000000},
+@@ -41,12 +57,10 @@ static const u32 ar9580_1p0_baseband_cor
+       {0x00009804, 0xfd14e000},
+       {0x00009808, 0x9c0a9f6b},
+       {0x0000980c, 0x04900000},
+-      {0x00009814, 0x3280c00a},
+-      {0x00009818, 0x00000000},
        {0x0000981c, 0x00020028},
 -      {0x00009834, 0x6400a290},
 +      {0x00009834, 0x6400a190},
        {0x00009880, 0x201fff00},
        {0x00009884, 0x00001042},
        {0x000098a4, 0x00200400},
-@@ -67,7 +83,7 @@ static const u32 ar9580_1p0_baseband_cor
+@@ -67,7 +81,7 @@ static const u32 ar9580_1p0_baseband_cor
        {0x00009d04, 0x40206c10},
        {0x00009d08, 0x009c4060},
        {0x00009d0c, 0x9883800a},
        {0x00009d14, 0x00c0040b},
        {0x00009d18, 0x00000000},
        {0x00009e08, 0x0038230c},
-@@ -198,8 +214,6 @@ static const u32 ar9580_1p0_baseband_cor
+@@ -198,8 +212,6 @@ static const u32 ar9580_1p0_baseband_cor
        {0x0000c420, 0x00000000},
  };
  
  static const u32 ar9580_1p0_low_ob_db_tx_gain_table[][5] = {
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-@@ -306,7 +320,112 @@ static const u32 ar9580_1p0_low_ob_db_tx
+@@ -306,7 +318,112 @@ static const u32 ar9580_1p0_low_ob_db_tx
        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
  };
  
  
  static const u32 ar9580_1p0_lowest_ob_db_tx_gain_table[][5] = {
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-@@ -414,8 +533,6 @@ static const u32 ar9580_1p0_lowest_ob_db
+@@ -414,8 +531,6 @@ static const u32 ar9580_1p0_lowest_ob_db
        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
  };
  
  static const u32 ar9580_1p0_mac_core[][2] = {
        /* Addr      allmodes  */
        {0x00000008, 0x00000000},
-@@ -679,14 +796,6 @@ static const u32 ar9580_1p0_mixed_ob_db_
+@@ -679,14 +794,6 @@ static const u32 ar9580_1p0_mixed_ob_db_
        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
  };
  
  static const u32 ar9580_1p0_type6_tx_gain_table[][5] = {
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
        {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
-@@ -761,160 +870,264 @@ static const u32 ar9580_1p0_type6_tx_gai
+@@ -761,165 +868,271 @@ static const u32 ar9580_1p0_type6_tx_gai
        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
  };
  
 -static const u32 ar9580_1p0_soc_preamble[][2] = {
--      /* Addr      allmodes  */
++static const u32 ar9580_1p0_rx_gain_table[][2] = {
+       /* Addr      allmodes  */
 -      {0x000040a4, 0x00a0c1c9},
 -      {0x00007008, 0x00000000},
 -      {0x00007020, 0x00000000},
 -#define ar9580_1p0_rx_gain_table ar9462_common_rx_gain_table_2p0
 -
 -static const u32 ar9580_1p0_radio_core[][2] = {
-+static const u32 ar9580_1p0_rx_gain_table[][2] = {
-       /* Addr      allmodes  */
+-      /* Addr      allmodes  */
 -      {0x00016000, 0x36db6db6},
 -      {0x00016004, 0x6db6db40},
 -      {0x00016008, 0x73f00000},
 +      {0x0000b1fc, 0x00000196},
  };
  
- static const u32 ar9580_1p0_baseband_postamble[][5] = {
-@@ -956,7 +1169,7 @@ static const u32 ar9580_1p0_baseband_pos
-       {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
-       {0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
-       {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
--      {0x0000a2d0, 0x00041981, 0x00041981, 0x00041981, 0x00041982},
-+      {0x0000a2d0, 0x00041983, 0x00041983, 0x00041981, 0x00041982},
-       {0x0000a2d8, 0x7999a83b, 0x7999a83b, 0x7999a83b, 0x7999a83b},
-       {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-       {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
---- a/drivers/net/wireless/ath/ath9k/reg.h
-+++ b/drivers/net/wireless/ath/ath9k/reg.h
-@@ -809,6 +809,8 @@
- #define AR_SREV_REVISION_9462_21      3
- #define AR_SREV_VERSION_9565            0x2C0
- #define AR_SREV_REVISION_9565_10        0
-+#define AR_SREV_REVISION_9565_101       1
-+#define AR_SREV_REVISION_9565_11        2
- #define AR_SREV_VERSION_9550          0x400
+ static const u32 ar9580_1p0_baseband_postamble[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
++      {0x00009814, 0x3280c00a, 0x3280c00a, 0x3280c00a, 0x3280c00a},
++      {0x00009818, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+       {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},
+       {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+       {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
+@@ -956,7 +1169,7 @@ static const u32 ar9580_1p0_baseband_pos
+       {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
+       {0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
+       {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
+-      {0x0000a2d0, 0x00041981, 0x00041981, 0x00041981, 0x00041982},
++      {0x0000a2d0, 0x00041983, 0x00041983, 0x00041981, 0x00041982},
+       {0x0000a2d8, 0x7999a83b, 0x7999a83b, 0x7999a83b, 0x7999a83b},
+       {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+       {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+@@ -994,4 +1207,13 @@ static const u32 ar9580_1p0_pcie_phy_pll
+       {0x00004044, 0x00000000},
+ };
++static const u32 ar9580_1p0_baseband_postamble_dfs_channel[][3] = {
++      /* Addr      5G          2G        */
++      {0x00009814, 0x3400c00f, 0x3400c00f},
++      {0x00009824, 0x5ac668d0, 0x5ac668d0},
++      {0x00009828, 0x06903080, 0x06903080},
++      {0x00009e0c, 0x6d4000e2, 0x6d4000e2},
++      {0x00009e14, 0x37b9625e, 0x37b9625e},
++};
++
+ #endif /* INITVALS_9580_1P0_H */
+--- a/drivers/net/wireless/ath/ath9k/reg.h
++++ b/drivers/net/wireless/ath/ath9k/reg.h
+@@ -809,6 +809,8 @@
+ #define AR_SREV_REVISION_9462_21      3
+ #define AR_SREV_VERSION_9565            0x2C0
+ #define AR_SREV_REVISION_9565_10        0
++#define AR_SREV_REVISION_9565_101       1
++#define AR_SREV_REVISION_9565_11        2
+ #define AR_SREV_VERSION_9550          0x400
+ #define AR_SREV_5416(_ah) \
+@@ -881,9 +883,6 @@
+ #define AR_SREV_9330(_ah) \
+       (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9330))
+-#define AR_SREV_9330_10(_ah) \
+-      (AR_SREV_9330((_ah)) && \
+-       ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_10))
+ #define AR_SREV_9330_11(_ah) \
+       (AR_SREV_9330((_ah)) && \
+        ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_11))
+@@ -927,10 +926,18 @@
+ #define AR_SREV_9565(_ah) \
+       (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565))
+-
+ #define AR_SREV_9565_10(_ah) \
+       (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565) && \
+        ((_ah)->hw_version.macRev == AR_SREV_REVISION_9565_10))
++#define AR_SREV_9565_101(_ah) \
++      (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565) && \
++       ((_ah)->hw_version.macRev == AR_SREV_REVISION_9565_101))
++#define AR_SREV_9565_11(_ah) \
++      (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565) && \
++       ((_ah)->hw_version.macRev == AR_SREV_REVISION_9565_11))
++#define AR_SREV_9565_11_OR_LATER(_ah) \
++      (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565) && \
++       ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9565_11))
+ #define AR_SREV_9550(_ah) \
+       (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9550))
+--- a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
+@@ -18,6 +18,10 @@
+ #ifndef INITVALS_9330_1P1_H
+ #define INITVALS_9330_1P1_H
++#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484
++
++#define ar9331_modes_high_power_tx_gain_1p1 ar9331_modes_lowest_ob_db_tx_gain_1p1
++
+ static const u32 ar9331_1p1_baseband_postamble[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
+@@ -55,7 +59,7 @@ static const u32 ar9331_1p1_baseband_pos
+       {0x0000a284, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+       {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+       {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
++      {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00058d18, 0x00058d18},
+       {0x0000a2d0, 0x00071982, 0x00071982, 0x00071982, 0x00071982},
+       {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
+       {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+@@ -252,7 +256,7 @@ static const u32 ar9331_modes_low_ob_db_
+       {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
+       {0x0000a2e4, 0xfffff000, 0xfffff000, 0xfffff000, 0xfffff000},
+       {0x0000a2e8, 0xfffe0000, 0xfffe0000, 0xfffe0000, 0xfffe0000},
+-      {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d0, 0x000050d0},
++      {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d4, 0x000050d4},
+       {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
+       {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
+       {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
+@@ -337,8 +341,6 @@ static const u32 ar9331_modes_low_ob_db_
+       {0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
+ };
+-#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484
+-
+ static const u32 ar9331_1p1_xtal_25M[][2] = {
+       /* Addr      allmodes  */
+       {0x00007038, 0x000002f8},
+@@ -373,17 +375,17 @@ static const u32 ar9331_1p1_radio_core[]
+       {0x000160b4, 0x92480040},
+       {0x000160c0, 0x006db6db},
+       {0x000160c4, 0x0186db60},
+-      {0x000160c8, 0x6db4db6c},
++      {0x000160c8, 0x6db6db6c},
+       {0x000160cc, 0x6de6c300},
+       {0x000160d0, 0x14500820},
+       {0x00016100, 0x04cb0001},
+       {0x00016104, 0xfff80015},
+       {0x00016108, 0x00080010},
+       {0x0001610c, 0x00170000},
+-      {0x00016140, 0x10800000},
++      {0x00016140, 0x50804000},
+       {0x00016144, 0x01884080},
+       {0x00016148, 0x000080c0},
+-      {0x00016280, 0x01000015},
++      {0x00016280, 0x01001015},
+       {0x00016284, 0x14d20000},
+       {0x00016288, 0x00318000},
+       {0x0001628c, 0x50000000},
+@@ -622,12 +624,12 @@ static const u32 ar9331_1p1_baseband_cor
+       {0x0000a370, 0x00000000},
+       {0x0000a390, 0x00000001},
+       {0x0000a394, 0x00000444},
+-      {0x0000a398, 0x001f0e0f},
+-      {0x0000a39c, 0x0075393f},
+-      {0x0000a3a0, 0xb79f6427},
+-      {0x0000a3a4, 0x00000000},
+-      {0x0000a3a8, 0xaaaaaaaa},
+-      {0x0000a3ac, 0x3c466478},
++      {0x0000a398, 0x00000000},
++      {0x0000a39c, 0x210d0401},
++      {0x0000a3a0, 0xab9a7144},
++      {0x0000a3a4, 0x00000011},
++      {0x0000a3a8, 0x3c3c003d},
++      {0x0000a3ac, 0x30310030},
+       {0x0000a3c0, 0x20202020},
+       {0x0000a3c4, 0x22222220},
+       {0x0000a3c8, 0x20200020},
+@@ -686,100 +688,18 @@ static const u32 ar9331_1p1_baseband_cor
+       {0x0000a7dc, 0x00000001},
+ };
+-static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = {
++static const u32 ar9331_1p1_mac_postamble[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
+-      {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
+-      {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
+-      {0x0000a2e4, 0xfffff000, 0xfffff000, 0xfffff000, 0xfffff000},
+-      {0x0000a2e8, 0xfffe0000, 0xfffe0000, 0xfffe0000, 0xfffe0000},
+-      {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d0, 0x000050d0},
+-      {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
+-      {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
+-      {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
+-      {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
+-      {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
+-      {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
+-      {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
+-      {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
+-      {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
+-      {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
+-      {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
+-      {0x0000a52c, 0x41023e85, 0x41023e85, 0x2d000a20, 0x2d000a20},
+-      {0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000a22, 0x31000a22},
+-      {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000a24, 0x35000a24},
+-      {0x0000a538, 0x53023f4b, 0x53023f4b, 0x38000a43, 0x38000a43},
+-      {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x3b000e42, 0x3b000e42},
+-      {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x3f000e44, 0x3f000e44},
+-      {0x0000a544, 0x6502feca, 0x6502feca, 0x42000e64, 0x42000e64},
+-      {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x46000e66, 0x46000e66},
+-      {0x0000a54c, 0x7203feca, 0x7203feca, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a560, 0x900fff0b, 0x900fff0b, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a564, 0x960fffcb, 0x960fffcb, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
+-      {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
+-      {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
+-      {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
+-      {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
+-      {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
+-      {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
+-      {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
+-      {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
+-      {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
+-      {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
+-      {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
+-      {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
+-      {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
+-      {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
+-      {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
+-      {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
+-      {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
+-      {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
+-      {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
+-      {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
+-      {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
+-      {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
+-      {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
+-      {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
+-      {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
+-      {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
+-      {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
+-      {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
+-      {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
+-      {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
+-      {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
+-      {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
+-      {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
+-      {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
+-      {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
+-      {0x0000a620, 0x0280c802, 0x0280c802, 0x0280c802, 0x0280c802},
+-      {0x0000a624, 0x03010a03, 0x03010a03, 0x03010a03, 0x03010a03},
+-      {0x0000a628, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
+-      {0x0000a62c, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
+-      {0x0000a630, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
+-      {0x0000a634, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
+-      {0x0000a638, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
+-      {0x0000a63c, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
+-      {0x00016044, 0x034922db, 0x034922db, 0x034922db, 0x034922db},
+-      {0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
++      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
++      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
++      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
++      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
++      {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
++      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
++      {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
++      {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
+ };
+-#define ar9331_1p1_mac_postamble ar9300_2p2_mac_postamble
+-
+ static const u32 ar9331_1p1_soc_preamble[][2] = {
+       /* Addr      allmodes  */
+       {0x00007020, 0x00000000},
+--- a/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
+@@ -18,6 +18,28 @@
+ #ifndef INITVALS_9330_1P2_H
+ #define INITVALS_9330_1P2_H
++#define ar9331_modes_high_power_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2
++
++#define ar9331_modes_low_ob_db_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2
++
++#define ar9331_modes_lowest_ob_db_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2
++
++#define ar9331_1p2_baseband_core_txfir_coeff_japan_2484 ar9331_1p1_baseband_core_txfir_coeff_japan_2484
++
++#define ar9331_1p2_xtal_25M ar9331_1p1_xtal_25M
++
++#define ar9331_1p2_xtal_40M ar9331_1p1_xtal_40M
++
++#define ar9331_1p2_soc_postamble ar9331_1p1_soc_postamble
++
++#define ar9331_1p2_mac_postamble ar9331_1p1_mac_postamble
++
++#define ar9331_1p2_soc_preamble ar9331_1p1_soc_preamble
++
++#define ar9331_1p2_mac_core ar9331_1p1_mac_core
++
++#define ar9331_common_wo_xlna_rx_gain_1p2 ar9331_common_wo_xlna_rx_gain_1p1
++
+ static const u32 ar9331_modes_high_ob_db_tx_gain_1p2[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
+@@ -103,57 +125,6 @@ static const u32 ar9331_modes_high_ob_db
+       {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
+ };
+-#define ar9331_modes_high_power_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2
+-
+-#define ar9331_modes_low_ob_db_tx_gain_1p2 ar9331_modes_high_power_tx_gain_1p2
+-
+-#define ar9331_modes_lowest_ob_db_tx_gain_1p2 ar9331_modes_low_ob_db_tx_gain_1p2
+-
+-static const u32 ar9331_1p2_baseband_postamble[][5] = {
+-      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
+-      {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
+-      {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+-      {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
+-      {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+-      {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
+-      {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
+-      {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a4, 0x037216a4},
+-      {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
+-      {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
+-      {0x00009e10, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e},
+-      {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
+-      {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
+-      {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
+-      {0x00009e2c, 0x0000001c, 0x0000001c, 0x00003221, 0x00003221},
+-      {0x00009e3c, 0xcf946222, 0xcf946222, 0xcf946222, 0xcf946222},
+-      {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324},
+-      {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010},
+-      {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
+-      {0x0000a204, 0x00003fc0, 0x00003fc4, 0x00003fc4, 0x00003fc0},
+-      {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
+-      {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
+-      {0x0000a234, 0x00000fff, 0x00000fff, 0x10000fff, 0x00000fff},
+-      {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
+-      {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
+-      {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
+-      {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
+-      {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
+-      {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501},
+-      {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+-      {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
+-      {0x0000a284, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
+-      {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071981},
+-      {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
+-      {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000ae04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
+-      {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-};
+-
+ static const u32 ar9331_1p2_radio_core[][2] = {
+       /* Addr      allmodes  */
+       {0x00016000, 0x36db6db6},
+@@ -219,24 +190,318 @@ static const u32 ar9331_1p2_radio_core[]
+       {0x000163d4, 0x00000000},
+ };
+-#define ar9331_1p2_baseband_core_txfir_coeff_japan_2484 ar9331_1p1_baseband_core_txfir_coeff_japan_2484
+-
+-#define ar9331_1p2_xtal_25M ar9331_1p1_xtal_25M
+-
+-#define ar9331_1p2_xtal_40M ar9331_1p1_xtal_40M
+-
+-#define ar9331_1p2_baseband_core ar9331_1p1_baseband_core
+-
+-#define ar9331_1p2_soc_postamble ar9331_1p1_soc_postamble
+-
+-#define ar9331_1p2_mac_postamble ar9331_1p1_mac_postamble
+-
+-#define ar9331_1p2_soc_preamble ar9331_1p1_soc_preamble
+-
+-#define ar9331_1p2_mac_core ar9331_1p1_mac_core
++static const u32 ar9331_1p2_baseband_core[][2] = {
++      /* Addr      allmodes  */
++      {0x00009800, 0xafe68e30},
++      {0x00009804, 0xfd14e000},
++      {0x00009808, 0x9c0a8f6b},
++      {0x0000980c, 0x04800000},
++      {0x00009814, 0x9280c00a},
++      {0x00009818, 0x00000000},
++      {0x0000981c, 0x00020028},
++      {0x00009834, 0x5f3ca3de},
++      {0x00009838, 0x0108ecff},
++      {0x0000983c, 0x14750600},
++      {0x00009880, 0x201fff00},
++      {0x00009884, 0x00001042},
++      {0x000098a4, 0x00200400},
++      {0x000098b0, 0x32840bbe},
++      {0x000098d0, 0x004b6a8e},
++      {0x000098d4, 0x00000820},
++      {0x000098dc, 0x00000000},
++      {0x000098f0, 0x00000000},
++      {0x000098f4, 0x00000000},
++      {0x00009c04, 0x00000000},
++      {0x00009c08, 0x03200000},
++      {0x00009c0c, 0x00000000},
++      {0x00009c10, 0x00000000},
++      {0x00009c14, 0x00046384},
++      {0x00009c18, 0x05b6b440},
++      {0x00009c1c, 0x00b6b440},
++      {0x00009d00, 0xc080a333},
++      {0x00009d04, 0x40206c10},
++      {0x00009d08, 0x009c4060},
++      {0x00009d0c, 0x1883800a},
++      {0x00009d10, 0x01834061},
++      {0x00009d14, 0x00c00400},
++      {0x00009d18, 0x00000000},
++      {0x00009e08, 0x0038233c},
++      {0x00009e24, 0x9927b515},
++      {0x00009e28, 0x12ef0200},
++      {0x00009e30, 0x06336f77},
++      {0x00009e34, 0x6af6532f},
++      {0x00009e38, 0x0cc80c00},
++      {0x00009e40, 0x0d261820},
++      {0x00009e4c, 0x00001004},
++      {0x00009e50, 0x00ff03f1},
++      {0x00009fc0, 0x803e4788},
++      {0x00009fc4, 0x0001efb5},
++      {0x00009fcc, 0x40000014},
++      {0x0000a20c, 0x00000000},
++      {0x0000a220, 0x00000000},
++      {0x0000a224, 0x00000000},
++      {0x0000a228, 0x10002310},
++      {0x0000a23c, 0x00000000},
++      {0x0000a244, 0x0c000000},
++      {0x0000a2a0, 0x00000001},
++      {0x0000a2c0, 0x00000001},
++      {0x0000a2c8, 0x00000000},
++      {0x0000a2cc, 0x18c43433},
++      {0x0000a2d4, 0x00000000},
++      {0x0000a2dc, 0x00000000},
++      {0x0000a2e0, 0x00000000},
++      {0x0000a2e4, 0x00000000},
++      {0x0000a2e8, 0x00000000},
++      {0x0000a2ec, 0x00000000},
++      {0x0000a2f0, 0x00000000},
++      {0x0000a2f4, 0x00000000},
++      {0x0000a2f8, 0x00000000},
++      {0x0000a344, 0x00000000},
++      {0x0000a34c, 0x00000000},
++      {0x0000a350, 0x0000a000},
++      {0x0000a364, 0x00000000},
++      {0x0000a370, 0x00000000},
++      {0x0000a390, 0x00000001},
++      {0x0000a394, 0x00000444},
++      {0x0000a398, 0x001f0e0f},
++      {0x0000a39c, 0x0075393f},
++      {0x0000a3a0, 0xb79f6427},
++      {0x0000a3a4, 0x00000000},
++      {0x0000a3a8, 0xaaaaaaaa},
++      {0x0000a3ac, 0x3c466478},
++      {0x0000a3c0, 0x20202020},
++      {0x0000a3c4, 0x22222220},
++      {0x0000a3c8, 0x20200020},
++      {0x0000a3cc, 0x20202020},
++      {0x0000a3d0, 0x20202020},
++      {0x0000a3d4, 0x20202020},
++      {0x0000a3d8, 0x20202020},
++      {0x0000a3dc, 0x20202020},
++      {0x0000a3e0, 0x20202020},
++      {0x0000a3e4, 0x20202020},
++      {0x0000a3e8, 0x20202020},
++      {0x0000a3ec, 0x20202020},
++      {0x0000a3f0, 0x00000000},
++      {0x0000a3f4, 0x00000006},
++      {0x0000a3f8, 0x0cdbd380},
++      {0x0000a3fc, 0x000f0f01},
++      {0x0000a400, 0x8fa91f01},
++      {0x0000a404, 0x00000000},
++      {0x0000a408, 0x0e79e5c6},
++      {0x0000a40c, 0x00820820},
++      {0x0000a414, 0x1ce739ce},
++      {0x0000a418, 0x2d001dce},
++      {0x0000a41c, 0x1ce739ce},
++      {0x0000a420, 0x000001ce},
++      {0x0000a424, 0x1ce739ce},
++      {0x0000a428, 0x000001ce},
++      {0x0000a42c, 0x1ce739ce},
++      {0x0000a430, 0x1ce739ce},
++      {0x0000a434, 0x00000000},
++      {0x0000a438, 0x00001801},
++      {0x0000a43c, 0x00000000},
++      {0x0000a440, 0x00000000},
++      {0x0000a444, 0x00000000},
++      {0x0000a448, 0x04000000},
++      {0x0000a44c, 0x00000001},
++      {0x0000a450, 0x00010000},
++      {0x0000a458, 0x00000000},
++      {0x0000a640, 0x00000000},
++      {0x0000a644, 0x3fad9d74},
++      {0x0000a648, 0x0048060a},
++      {0x0000a64c, 0x00003c37},
++      {0x0000a670, 0x03020100},
++      {0x0000a674, 0x09080504},
++      {0x0000a678, 0x0d0c0b0a},
++      {0x0000a67c, 0x13121110},
++      {0x0000a680, 0x31301514},
++      {0x0000a684, 0x35343332},
++      {0x0000a688, 0x00000036},
++      {0x0000a690, 0x00000838},
++      {0x0000a7c0, 0x00000000},
++      {0x0000a7c4, 0xfffffffc},
++      {0x0000a7c8, 0x00000000},
++      {0x0000a7cc, 0x00000000},
++      {0x0000a7d0, 0x00000000},
++      {0x0000a7d4, 0x00000004},
++      {0x0000a7dc, 0x00000001},
++};
+-#define ar9331_common_wo_xlna_rx_gain_1p2 ar9331_common_wo_xlna_rx_gain_1p1
++static const u32 ar9331_1p2_baseband_postamble[][5] = {
++      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
++      {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
++      {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
++      {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
++      {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
++      {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
++      {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
++      {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
++      {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a4, 0x037216a4},
++      {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
++      {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
++      {0x00009e10, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e},
++      {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
++      {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
++      {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
++      {0x00009e2c, 0x0000001c, 0x0000001c, 0x00003221, 0x00003221},
++      {0x00009e3c, 0xcf946222, 0xcf946222, 0xcf946222, 0xcf946222},
++      {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324},
++      {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010},
++      {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
++      {0x0000a204, 0x00003fc0, 0x00003fc4, 0x00003fc4, 0x00003fc0},
++      {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
++      {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
++      {0x0000a234, 0x00000fff, 0x00000fff, 0x10000fff, 0x00000fff},
++      {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
++      {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
++      {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
++      {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
++      {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
++      {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501},
++      {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
++      {0x0000a284, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
++      {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071981},
++      {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
++      {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000ae04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
++      {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++};
+-#define ar9331_common_rx_gain_1p2 ar9485_common_rx_gain_1_1
++static const u32 ar9331_common_rx_gain_1p2[][2] = {
++      /* Addr      allmodes  */
++      {0x0000a000, 0x00010000},
++      {0x0000a004, 0x00030002},
++      {0x0000a008, 0x00050004},
++      {0x0000a00c, 0x00810080},
++      {0x0000a010, 0x01800082},
++      {0x0000a014, 0x01820181},
++      {0x0000a018, 0x01840183},
++      {0x0000a01c, 0x01880185},
++      {0x0000a020, 0x018a0189},
++      {0x0000a024, 0x02850284},
++      {0x0000a028, 0x02890288},
++      {0x0000a02c, 0x03850384},
++      {0x0000a030, 0x03890388},
++      {0x0000a034, 0x038b038a},
++      {0x0000a038, 0x038d038c},
++      {0x0000a03c, 0x03910390},
++      {0x0000a040, 0x03930392},
++      {0x0000a044, 0x03950394},
++      {0x0000a048, 0x00000396},
++      {0x0000a04c, 0x00000000},
++      {0x0000a050, 0x00000000},
++      {0x0000a054, 0x00000000},
++      {0x0000a058, 0x00000000},
++      {0x0000a05c, 0x00000000},
++      {0x0000a060, 0x00000000},
++      {0x0000a064, 0x00000000},
++      {0x0000a068, 0x00000000},
++      {0x0000a06c, 0x00000000},
++      {0x0000a070, 0x00000000},
++      {0x0000a074, 0x00000000},
++      {0x0000a078, 0x00000000},
++      {0x0000a07c, 0x00000000},
++      {0x0000a080, 0x28282828},
++      {0x0000a084, 0x28282828},
++      {0x0000a088, 0x28282828},
++      {0x0000a08c, 0x28282828},
++      {0x0000a090, 0x28282828},
++      {0x0000a094, 0x21212128},
++      {0x0000a098, 0x171c1c1c},
++      {0x0000a09c, 0x02020212},
++      {0x0000a0a0, 0x00000202},
++      {0x0000a0a4, 0x00000000},
++      {0x0000a0a8, 0x00000000},
++      {0x0000a0ac, 0x00000000},
++      {0x0000a0b0, 0x00000000},
++      {0x0000a0b4, 0x00000000},
++      {0x0000a0b8, 0x00000000},
++      {0x0000a0bc, 0x00000000},
++      {0x0000a0c0, 0x001f0000},
++      {0x0000a0c4, 0x111f1100},
++      {0x0000a0c8, 0x111d111e},
++      {0x0000a0cc, 0x111b111c},
++      {0x0000a0d0, 0x22032204},
++      {0x0000a0d4, 0x22012202},
++      {0x0000a0d8, 0x221f2200},
++      {0x0000a0dc, 0x221d221e},
++      {0x0000a0e0, 0x33013302},
++      {0x0000a0e4, 0x331f3300},
++      {0x0000a0e8, 0x4402331e},
++      {0x0000a0ec, 0x44004401},
++      {0x0000a0f0, 0x441e441f},
++      {0x0000a0f4, 0x55015502},
++      {0x0000a0f8, 0x551f5500},
++      {0x0000a0fc, 0x6602551e},
++      {0x0000a100, 0x66006601},
++      {0x0000a104, 0x661e661f},
++      {0x0000a108, 0x7703661d},
++      {0x0000a10c, 0x77017702},
++      {0x0000a110, 0x00007700},
++      {0x0000a114, 0x00000000},
++      {0x0000a118, 0x00000000},
++      {0x0000a11c, 0x00000000},
++      {0x0000a120, 0x00000000},
++      {0x0000a124, 0x00000000},
++      {0x0000a128, 0x00000000},
++      {0x0000a12c, 0x00000000},
++      {0x0000a130, 0x00000000},
++      {0x0000a134, 0x00000000},
++      {0x0000a138, 0x00000000},
++      {0x0000a13c, 0x00000000},
++      {0x0000a140, 0x001f0000},
++      {0x0000a144, 0x111f1100},
++      {0x0000a148, 0x111d111e},
++      {0x0000a14c, 0x111b111c},
++      {0x0000a150, 0x22032204},
++      {0x0000a154, 0x22012202},
++      {0x0000a158, 0x221f2200},
++      {0x0000a15c, 0x221d221e},
++      {0x0000a160, 0x33013302},
++      {0x0000a164, 0x331f3300},
++      {0x0000a168, 0x4402331e},
++      {0x0000a16c, 0x44004401},
++      {0x0000a170, 0x441e441f},
++      {0x0000a174, 0x55015502},
++      {0x0000a178, 0x551f5500},
++      {0x0000a17c, 0x6602551e},
++      {0x0000a180, 0x66006601},
++      {0x0000a184, 0x661e661f},
++      {0x0000a188, 0x7703661d},
++      {0x0000a18c, 0x77017702},
++      {0x0000a190, 0x00007700},
++      {0x0000a194, 0x00000000},
++      {0x0000a198, 0x00000000},
++      {0x0000a19c, 0x00000000},
++      {0x0000a1a0, 0x00000000},
++      {0x0000a1a4, 0x00000000},
++      {0x0000a1a8, 0x00000000},
++      {0x0000a1ac, 0x00000000},
++      {0x0000a1b0, 0x00000000},
++      {0x0000a1b4, 0x00000000},
++      {0x0000a1b8, 0x00000000},
++      {0x0000a1bc, 0x00000000},
++      {0x0000a1c0, 0x00000000},
++      {0x0000a1c4, 0x00000000},
++      {0x0000a1c8, 0x00000000},
++      {0x0000a1cc, 0x00000000},
++      {0x0000a1d0, 0x00000000},
++      {0x0000a1d4, 0x00000000},
++      {0x0000a1d8, 0x00000000},
++      {0x0000a1dc, 0x00000000},
++      {0x0000a1e0, 0x00000000},
++      {0x0000a1e4, 0x00000000},
++      {0x0000a1e8, 0x00000000},
++      {0x0000a1ec, 0x00000000},
++      {0x0000a1f0, 0x00000396},
++      {0x0000a1f4, 0x00000396},
++      {0x0000a1f8, 0x00000396},
++      {0x0000a1fc, 0x00000296},
++};
+ #endif /* INITVALS_9330_1P2_H */
+--- a/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
+@@ -20,6 +20,14 @@
+ /* AR955X 1.0 */
++#define ar955x_1p0_soc_postamble ar9300_2p2_soc_postamble
++
++#define ar955x_1p0_common_rx_gain_table ar9300Common_rx_gain_table_2p2
++
++#define ar955x_1p0_common_wo_xlna_rx_gain_table ar9300Common_wo_xlna_rx_gain_table_2p2
++
++#define ar955x_1p0_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484
++
+ static const u32 ar955x_1p0_radio_postamble[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x00016098, 0xd2dd5554, 0xd2dd5554, 0xd28b3330, 0xd28b3330},
+@@ -37,13 +45,6 @@ static const u32 ar955x_1p0_radio_postam
+       {0x00016940, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
+ };
+-static const u32 ar955x_1p0_baseband_core_txfir_coeff_japan_2484[][2] = {
+-      /* Addr      allmodes  */
+-      {0x0000a398, 0x00000000},
+-      {0x0000a39c, 0x6f7f0301},
+-      {0x0000a3a0, 0xca9228ee},
+-};
+-
+ static const u32 ar955x_1p0_baseband_postamble[][5] = {
+       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
+@@ -473,266 +474,6 @@ static const u32 ar955x_1p0_mac_core[][2
+       {0x000083d0, 0x8c7901ff},
+ };
+-static const u32 ar955x_1p0_common_rx_gain_table[][2] = {
+-      /* Addr      allmodes  */
+-      {0x0000a000, 0x00010000},
+-      {0x0000a004, 0x00030002},
+-      {0x0000a008, 0x00050004},
+-      {0x0000a00c, 0x00810080},
+-      {0x0000a010, 0x00830082},
+-      {0x0000a014, 0x01810180},
+-      {0x0000a018, 0x01830182},
+-      {0x0000a01c, 0x01850184},
+-      {0x0000a020, 0x01890188},
+-      {0x0000a024, 0x018b018a},
+-      {0x0000a028, 0x018d018c},
+-      {0x0000a02c, 0x01910190},
+-      {0x0000a030, 0x01930192},
+-      {0x0000a034, 0x01950194},
+-      {0x0000a038, 0x038a0196},
+-      {0x0000a03c, 0x038c038b},
+-      {0x0000a040, 0x0390038d},
+-      {0x0000a044, 0x03920391},
+-      {0x0000a048, 0x03940393},
+-      {0x0000a04c, 0x03960395},
+-      {0x0000a050, 0x00000000},
+-      {0x0000a054, 0x00000000},
+-      {0x0000a058, 0x00000000},
+-      {0x0000a05c, 0x00000000},
+-      {0x0000a060, 0x00000000},
+-      {0x0000a064, 0x00000000},
+-      {0x0000a068, 0x00000000},
+-      {0x0000a06c, 0x00000000},
+-      {0x0000a070, 0x00000000},
+-      {0x0000a074, 0x00000000},
+-      {0x0000a078, 0x00000000},
+-      {0x0000a07c, 0x00000000},
+-      {0x0000a080, 0x22222229},
+-      {0x0000a084, 0x1d1d1d1d},
+-      {0x0000a088, 0x1d1d1d1d},
+-      {0x0000a08c, 0x1d1d1d1d},
+-      {0x0000a090, 0x171d1d1d},
+-      {0x0000a094, 0x11111717},
+-      {0x0000a098, 0x00030311},
+-      {0x0000a09c, 0x00000000},
+-      {0x0000a0a0, 0x00000000},
+-      {0x0000a0a4, 0x00000000},
+-      {0x0000a0a8, 0x00000000},
+-      {0x0000a0ac, 0x00000000},
+-      {0x0000a0b0, 0x00000000},
+-      {0x0000a0b4, 0x00000000},
+-      {0x0000a0b8, 0x00000000},
+-      {0x0000a0bc, 0x00000000},
+-      {0x0000a0c0, 0x001f0000},
+-      {0x0000a0c4, 0x01000101},
+-      {0x0000a0c8, 0x011e011f},
+-      {0x0000a0cc, 0x011c011d},
+-      {0x0000a0d0, 0x02030204},
+-      {0x0000a0d4, 0x02010202},
+-      {0x0000a0d8, 0x021f0200},
+-      {0x0000a0dc, 0x0302021e},
+-      {0x0000a0e0, 0x03000301},
+-      {0x0000a0e4, 0x031e031f},
+-      {0x0000a0e8, 0x0402031d},
+-      {0x0000a0ec, 0x04000401},
+-      {0x0000a0f0, 0x041e041f},
+-      {0x0000a0f4, 0x0502041d},
+-      {0x0000a0f8, 0x05000501},
+-      {0x0000a0fc, 0x051e051f},
+-      {0x0000a100, 0x06010602},
+-      {0x0000a104, 0x061f0600},
+-      {0x0000a108, 0x061d061e},
+-      {0x0000a10c, 0x07020703},
+-      {0x0000a110, 0x07000701},
+-      {0x0000a114, 0x00000000},
+-      {0x0000a118, 0x00000000},
+-      {0x0000a11c, 0x00000000},
+-      {0x0000a120, 0x00000000},
+-      {0x0000a124, 0x00000000},
+-      {0x0000a128, 0x00000000},
+-      {0x0000a12c, 0x00000000},
+-      {0x0000a130, 0x00000000},
+-      {0x0000a134, 0x00000000},
+-      {0x0000a138, 0x00000000},
+-      {0x0000a13c, 0x00000000},
+-      {0x0000a140, 0x001f0000},
+-      {0x0000a144, 0x01000101},
+-      {0x0000a148, 0x011e011f},
+-      {0x0000a14c, 0x011c011d},
+-      {0x0000a150, 0x02030204},
+-      {0x0000a154, 0x02010202},
+-      {0x0000a158, 0x021f0200},
+-      {0x0000a15c, 0x0302021e},
+-      {0x0000a160, 0x03000301},
+-      {0x0000a164, 0x031e031f},
+-      {0x0000a168, 0x0402031d},
+-      {0x0000a16c, 0x04000401},
+-      {0x0000a170, 0x041e041f},
+-      {0x0000a174, 0x0502041d},
+-      {0x0000a178, 0x05000501},
+-      {0x0000a17c, 0x051e051f},
+-      {0x0000a180, 0x06010602},
+-      {0x0000a184, 0x061f0600},
+-      {0x0000a188, 0x061d061e},
+-      {0x0000a18c, 0x07020703},
+-      {0x0000a190, 0x07000701},
+-      {0x0000a194, 0x00000000},
+-      {0x0000a198, 0x00000000},
+-      {0x0000a19c, 0x00000000},
+-      {0x0000a1a0, 0x00000000},
+-      {0x0000a1a4, 0x00000000},
+-      {0x0000a1a8, 0x00000000},
+-      {0x0000a1ac, 0x00000000},
+-      {0x0000a1b0, 0x00000000},
+-      {0x0000a1b4, 0x00000000},
+-      {0x0000a1b8, 0x00000000},
+-      {0x0000a1bc, 0x00000000},
+-      {0x0000a1c0, 0x00000000},
+-      {0x0000a1c4, 0x00000000},
+-      {0x0000a1c8, 0x00000000},
+-      {0x0000a1cc, 0x00000000},
+-      {0x0000a1d0, 0x00000000},
+-      {0x0000a1d4, 0x00000000},
+-      {0x0000a1d8, 0x00000000},
+-      {0x0000a1dc, 0x00000000},
+-      {0x0000a1e0, 0x00000000},
+-      {0x0000a1e4, 0x00000000},
+-      {0x0000a1e8, 0x00000000},
+-      {0x0000a1ec, 0x00000000},
+-      {0x0000a1f0, 0x00000396},
+-      {0x0000a1f4, 0x00000396},
+-      {0x0000a1f8, 0x00000396},
+-      {0x0000a1fc, 0x00000196},
+-      {0x0000b000, 0x00010000},
+-      {0x0000b004, 0x00030002},
+-      {0x0000b008, 0x00050004},
+-      {0x0000b00c, 0x00810080},
+-      {0x0000b010, 0x00830082},
+-      {0x0000b014, 0x01810180},
+-      {0x0000b018, 0x01830182},
+-      {0x0000b01c, 0x01850184},
+-      {0x0000b020, 0x02810280},
+-      {0x0000b024, 0x02830282},
+-      {0x0000b028, 0x02850284},
+-      {0x0000b02c, 0x02890288},
+-      {0x0000b030, 0x028b028a},
+-      {0x0000b034, 0x0388028c},
+-      {0x0000b038, 0x038a0389},
+-      {0x0000b03c, 0x038c038b},
+-      {0x0000b040, 0x0390038d},
+-      {0x0000b044, 0x03920391},
+-      {0x0000b048, 0x03940393},
+-      {0x0000b04c, 0x03960395},
+-      {0x0000b050, 0x00000000},
+-      {0x0000b054, 0x00000000},
+-      {0x0000b058, 0x00000000},
+-      {0x0000b05c, 0x00000000},
+-      {0x0000b060, 0x00000000},
+-      {0x0000b064, 0x00000000},
+-      {0x0000b068, 0x00000000},
+-      {0x0000b06c, 0x00000000},
+-      {0x0000b070, 0x00000000},
+-      {0x0000b074, 0x00000000},
+-      {0x0000b078, 0x00000000},
+-      {0x0000b07c, 0x00000000},
+-      {0x0000b080, 0x23232323},
+-      {0x0000b084, 0x21232323},
+-      {0x0000b088, 0x19191c1e},
+-      {0x0000b08c, 0x12141417},
+-      {0x0000b090, 0x07070e0e},
+-      {0x0000b094, 0x03030305},
+-      {0x0000b098, 0x00000003},
+-      {0x0000b09c, 0x00000000},
+-      {0x0000b0a0, 0x00000000},
+-      {0x0000b0a4, 0x00000000},
+-      {0x0000b0a8, 0x00000000},
+-      {0x0000b0ac, 0x00000000},
+-      {0x0000b0b0, 0x00000000},
+-      {0x0000b0b4, 0x00000000},
+-      {0x0000b0b8, 0x00000000},
+-      {0x0000b0bc, 0x00000000},
+-      {0x0000b0c0, 0x003f0020},
+-      {0x0000b0c4, 0x00400041},
+-      {0x0000b0c8, 0x0140005f},
+-      {0x0000b0cc, 0x0160015f},
+-      {0x0000b0d0, 0x017e017f},
+-      {0x0000b0d4, 0x02410242},
+-      {0x0000b0d8, 0x025f0240},
+-      {0x0000b0dc, 0x027f0260},
+-      {0x0000b0e0, 0x0341027e},
+-      {0x0000b0e4, 0x035f0340},
+-      {0x0000b0e8, 0x037f0360},
+-      {0x0000b0ec, 0x04400441},
+-      {0x0000b0f0, 0x0460045f},
+-      {0x0000b0f4, 0x0541047f},
+-      {0x0000b0f8, 0x055f0540},
+-      {0x0000b0fc, 0x057f0560},
+-      {0x0000b100, 0x06400641},
+-      {0x0000b104, 0x0660065f},
+-      {0x0000b108, 0x067e067f},
+-      {0x0000b10c, 0x07410742},
+-      {0x0000b110, 0x075f0740},
+-      {0x0000b114, 0x077f0760},
+-      {0x0000b118, 0x07800781},
+-      {0x0000b11c, 0x07a0079f},
+-      {0x0000b120, 0x07c107bf},
+-      {0x0000b124, 0x000007c0},
+-      {0x0000b128, 0x00000000},
+-      {0x0000b12c, 0x00000000},
+-      {0x0000b130, 0x00000000},
+-      {0x0000b134, 0x00000000},
+-      {0x0000b138, 0x00000000},
+-      {0x0000b13c, 0x00000000},
+-      {0x0000b140, 0x003f0020},
+-      {0x0000b144, 0x00400041},
+-      {0x0000b148, 0x0140005f},
+-      {0x0000b14c, 0x0160015f},
+-      {0x0000b150, 0x017e017f},
+-      {0x0000b154, 0x02410242},
+-      {0x0000b158, 0x025f0240},
+-      {0x0000b15c, 0x027f0260},
+-      {0x0000b160, 0x0341027e},
+-      {0x0000b164, 0x035f0340},
+-      {0x0000b168, 0x037f0360},
+-      {0x0000b16c, 0x04400441},
+-      {0x0000b170, 0x0460045f},
+-      {0x0000b174, 0x0541047f},
+-      {0x0000b178, 0x055f0540},
+-      {0x0000b17c, 0x057f0560},
+-      {0x0000b180, 0x06400641},
+-      {0x0000b184, 0x0660065f},
+-      {0x0000b188, 0x067e067f},
+-      {0x0000b18c, 0x07410742},
+-      {0x0000b190, 0x075f0740},
+-      {0x0000b194, 0x077f0760},
+-      {0x0000b198, 0x07800781},
+-      {0x0000b19c, 0x07a0079f},
+-      {0x0000b1a0, 0x07c107bf},
+-      {0x0000b1a4, 0x000007c0},
+-      {0x0000b1a8, 0x00000000},
+-      {0x0000b1ac, 0x00000000},
+-      {0x0000b1b0, 0x00000000},
+-      {0x0000b1b4, 0x00000000},
+-      {0x0000b1b8, 0x00000000},
+-      {0x0000b1bc, 0x00000000},
+-      {0x0000b1c0, 0x00000000},
+-      {0x0000b1c4, 0x00000000},
+-      {0x0000b1c8, 0x00000000},
+-      {0x0000b1cc, 0x00000000},
+-      {0x0000b1d0, 0x00000000},
+-      {0x0000b1d4, 0x00000000},
+-      {0x0000b1d8, 0x00000000},
+-      {0x0000b1dc, 0x00000000},
+-      {0x0000b1e0, 0x00000000},
+-      {0x0000b1e4, 0x00000000},
+-      {0x0000b1e8, 0x00000000},
+-      {0x0000b1ec, 0x00000000},
+-      {0x0000b1f0, 0x00000396},
+-      {0x0000b1f4, 0x00000396},
+-      {0x0000b1f8, 0x00000396},
+-      {0x0000b1fc, 0x00000196},
+-};
+-
+ static const u32 ar955x_1p0_baseband_core[][2] = {
+       /* Addr      allmodes  */
+       {0x00009800, 0xafe68e30},
+@@ -891,266 +632,6 @@ static const u32 ar955x_1p0_baseband_cor
+       {0x0000c420, 0x00000000},
+ };
+-static const u32 ar955x_1p0_common_wo_xlna_rx_gain_table[][2] = {
+-      /* Addr      allmodes  */
+-      {0x0000a000, 0x00010000},
+-      {0x0000a004, 0x00030002},
+-      {0x0000a008, 0x00050004},
+-      {0x0000a00c, 0x00810080},
+-      {0x0000a010, 0x00830082},
+-      {0x0000a014, 0x01810180},
+-      {0x0000a018, 0x01830182},
+-      {0x0000a01c, 0x01850184},
+-      {0x0000a020, 0x01890188},
+-      {0x0000a024, 0x018b018a},
+-      {0x0000a028, 0x018d018c},
+-      {0x0000a02c, 0x03820190},
+-      {0x0000a030, 0x03840383},
+-      {0x0000a034, 0x03880385},
+-      {0x0000a038, 0x038a0389},
+-      {0x0000a03c, 0x038c038b},
+-      {0x0000a040, 0x0390038d},
+-      {0x0000a044, 0x03920391},
+-      {0x0000a048, 0x03940393},
+-      {0x0000a04c, 0x03960395},
+-      {0x0000a050, 0x00000000},
+-      {0x0000a054, 0x00000000},
+-      {0x0000a058, 0x00000000},
+-      {0x0000a05c, 0x00000000},
+-      {0x0000a060, 0x00000000},
+-      {0x0000a064, 0x00000000},
+-      {0x0000a068, 0x00000000},
+-      {0x0000a06c, 0x00000000},
+-      {0x0000a070, 0x00000000},
+-      {0x0000a074, 0x00000000},
+-      {0x0000a078, 0x00000000},
+-      {0x0000a07c, 0x00000000},
+-      {0x0000a080, 0x29292929},
+-      {0x0000a084, 0x29292929},
+-      {0x0000a088, 0x29292929},
+-      {0x0000a08c, 0x29292929},
+-      {0x0000a090, 0x22292929},
+-      {0x0000a094, 0x1d1d2222},
+-      {0x0000a098, 0x0c111117},
+-      {0x0000a09c, 0x00030303},
+-      {0x0000a0a0, 0x00000000},
+-      {0x0000a0a4, 0x00000000},
+-      {0x0000a0a8, 0x00000000},
+-      {0x0000a0ac, 0x00000000},
+-      {0x0000a0b0, 0x00000000},
+-      {0x0000a0b4, 0x00000000},
+-      {0x0000a0b8, 0x00000000},
+-      {0x0000a0bc, 0x00000000},
+-      {0x0000a0c0, 0x001f0000},
+-      {0x0000a0c4, 0x01000101},
+-      {0x0000a0c8, 0x011e011f},
+-      {0x0000a0cc, 0x011c011d},
+-      {0x0000a0d0, 0x02030204},
+-      {0x0000a0d4, 0x02010202},
+-      {0x0000a0d8, 0x021f0200},
+-      {0x0000a0dc, 0x0302021e},
+-      {0x0000a0e0, 0x03000301},
+-      {0x0000a0e4, 0x031e031f},
+-      {0x0000a0e8, 0x0402031d},
+-      {0x0000a0ec, 0x04000401},
+-      {0x0000a0f0, 0x041e041f},
+-      {0x0000a0f4, 0x0502041d},
+-      {0x0000a0f8, 0x05000501},
+-      {0x0000a0fc, 0x051e051f},
+-      {0x0000a100, 0x06010602},
+-      {0x0000a104, 0x061f0600},
+-      {0x0000a108, 0x061d061e},
+-      {0x0000a10c, 0x07020703},
+-      {0x0000a110, 0x07000701},
+-      {0x0000a114, 0x00000000},
+-      {0x0000a118, 0x00000000},
+-      {0x0000a11c, 0x00000000},
+-      {0x0000a120, 0x00000000},
+-      {0x0000a124, 0x00000000},
+-      {0x0000a128, 0x00000000},
+-      {0x0000a12c, 0x00000000},
+-      {0x0000a130, 0x00000000},
+-      {0x0000a134, 0x00000000},
+-      {0x0000a138, 0x00000000},
+-      {0x0000a13c, 0x00000000},
+-      {0x0000a140, 0x001f0000},
+-      {0x0000a144, 0x01000101},
+-      {0x0000a148, 0x011e011f},
+-      {0x0000a14c, 0x011c011d},
+-      {0x0000a150, 0x02030204},
+-      {0x0000a154, 0x02010202},
+-      {0x0000a158, 0x021f0200},
+-      {0x0000a15c, 0x0302021e},
+-      {0x0000a160, 0x03000301},
+-      {0x0000a164, 0x031e031f},
+-      {0x0000a168, 0x0402031d},
+-      {0x0000a16c, 0x04000401},
+-      {0x0000a170, 0x041e041f},
+-      {0x0000a174, 0x0502041d},
+-      {0x0000a178, 0x05000501},
+-      {0x0000a17c, 0x051e051f},
+-      {0x0000a180, 0x06010602},
+-      {0x0000a184, 0x061f0600},
+-      {0x0000a188, 0x061d061e},
+-      {0x0000a18c, 0x07020703},
+-      {0x0000a190, 0x07000701},
+-      {0x0000a194, 0x00000000},
+-      {0x0000a198, 0x00000000},
+-      {0x0000a19c, 0x00000000},
+-      {0x0000a1a0, 0x00000000},
+-      {0x0000a1a4, 0x00000000},
+-      {0x0000a1a8, 0x00000000},
+-      {0x0000a1ac, 0x00000000},
+-      {0x0000a1b0, 0x00000000},
+-      {0x0000a1b4, 0x00000000},
+-      {0x0000a1b8, 0x00000000},
+-      {0x0000a1bc, 0x00000000},
+-      {0x0000a1c0, 0x00000000},
+-      {0x0000a1c4, 0x00000000},
+-      {0x0000a1c8, 0x00000000},
+-      {0x0000a1cc, 0x00000000},
+-      {0x0000a1d0, 0x00000000},
+-      {0x0000a1d4, 0x00000000},
+-      {0x0000a1d8, 0x00000000},
+-      {0x0000a1dc, 0x00000000},
+-      {0x0000a1e0, 0x00000000},
+-      {0x0000a1e4, 0x00000000},
+-      {0x0000a1e8, 0x00000000},
+-      {0x0000a1ec, 0x00000000},
+-      {0x0000a1f0, 0x00000396},
+-      {0x0000a1f4, 0x00000396},
+-      {0x0000a1f8, 0x00000396},
+-      {0x0000a1fc, 0x00000196},
+-      {0x0000b000, 0x00010000},
+-      {0x0000b004, 0x00030002},
+-      {0x0000b008, 0x00050004},
+-      {0x0000b00c, 0x00810080},
+-      {0x0000b010, 0x00830082},
+-      {0x0000b014, 0x01810180},
+-      {0x0000b018, 0x01830182},
+-      {0x0000b01c, 0x01850184},
+-      {0x0000b020, 0x02810280},
+-      {0x0000b024, 0x02830282},
+-      {0x0000b028, 0x02850284},
+-      {0x0000b02c, 0x02890288},
+-      {0x0000b030, 0x028b028a},
+-      {0x0000b034, 0x0388028c},
+-      {0x0000b038, 0x038a0389},
+-      {0x0000b03c, 0x038c038b},
+-      {0x0000b040, 0x0390038d},
+-      {0x0000b044, 0x03920391},
+-      {0x0000b048, 0x03940393},
+-      {0x0000b04c, 0x03960395},
+-      {0x0000b050, 0x00000000},
+-      {0x0000b054, 0x00000000},
+-      {0x0000b058, 0x00000000},
+-      {0x0000b05c, 0x00000000},
+-      {0x0000b060, 0x00000000},
+-      {0x0000b064, 0x00000000},
+-      {0x0000b068, 0x00000000},
+-      {0x0000b06c, 0x00000000},
+-      {0x0000b070, 0x00000000},
+-      {0x0000b074, 0x00000000},
+-      {0x0000b078, 0x00000000},
+-      {0x0000b07c, 0x00000000},
+-      {0x0000b080, 0x32323232},
+-      {0x0000b084, 0x2f2f3232},
+-      {0x0000b088, 0x23282a2d},
+-      {0x0000b08c, 0x1c1e2123},
+-      {0x0000b090, 0x14171919},
+-      {0x0000b094, 0x0e0e1214},
+-      {0x0000b098, 0x03050707},
+-      {0x0000b09c, 0x00030303},
+-      {0x0000b0a0, 0x00000000},
+-      {0x0000b0a4, 0x00000000},
+-      {0x0000b0a8, 0x00000000},
+-      {0x0000b0ac, 0x00000000},
+-      {0x0000b0b0, 0x00000000},
+-      {0x0000b0b4, 0x00000000},
+-      {0x0000b0b8, 0x00000000},
+-      {0x0000b0bc, 0x00000000},
+-      {0x0000b0c0, 0x003f0020},
+-      {0x0000b0c4, 0x00400041},
+-      {0x0000b0c8, 0x0140005f},
+-      {0x0000b0cc, 0x0160015f},
+-      {0x0000b0d0, 0x017e017f},
+-      {0x0000b0d4, 0x02410242},
+-      {0x0000b0d8, 0x025f0240},
+-      {0x0000b0dc, 0x027f0260},
+-      {0x0000b0e0, 0x0341027e},
+-      {0x0000b0e4, 0x035f0340},
+-      {0x0000b0e8, 0x037f0360},
+-      {0x0000b0ec, 0x04400441},
+-      {0x0000b0f0, 0x0460045f},
+-      {0x0000b0f4, 0x0541047f},
+-      {0x0000b0f8, 0x055f0540},
+-      {0x0000b0fc, 0x057f0560},
+-      {0x0000b100, 0x06400641},
+-      {0x0000b104, 0x0660065f},
+-      {0x0000b108, 0x067e067f},
+-      {0x0000b10c, 0x07410742},
+-      {0x0000b110, 0x075f0740},
+-      {0x0000b114, 0x077f0760},
+-      {0x0000b118, 0x07800781},
+-      {0x0000b11c, 0x07a0079f},
+-      {0x0000b120, 0x07c107bf},
+-      {0x0000b124, 0x000007c0},
+-      {0x0000b128, 0x00000000},
+-      {0x0000b12c, 0x00000000},
+-      {0x0000b130, 0x00000000},
+-      {0x0000b134, 0x00000000},
+-      {0x0000b138, 0x00000000},
+-      {0x0000b13c, 0x00000000},
+-      {0x0000b140, 0x003f0020},
+-      {0x0000b144, 0x00400041},
+-      {0x0000b148, 0x0140005f},
+-      {0x0000b14c, 0x0160015f},
+-      {0x0000b150, 0x017e017f},
+-      {0x0000b154, 0x02410242},
+-      {0x0000b158, 0x025f0240},
+-      {0x0000b15c, 0x027f0260},
+-      {0x0000b160, 0x0341027e},
+-      {0x0000b164, 0x035f0340},
+-      {0x0000b168, 0x037f0360},
+-      {0x0000b16c, 0x04400441},
+-      {0x0000b170, 0x0460045f},
+-      {0x0000b174, 0x0541047f},
+-      {0x0000b178, 0x055f0540},
+-      {0x0000b17c, 0x057f0560},
+-      {0x0000b180, 0x06400641},
+-      {0x0000b184, 0x0660065f},
+-      {0x0000b188, 0x067e067f},
+-      {0x0000b18c, 0x07410742},
+-      {0x0000b190, 0x075f0740},
+-      {0x0000b194, 0x077f0760},
+-      {0x0000b198, 0x07800781},
+-      {0x0000b19c, 0x07a0079f},
+-      {0x0000b1a0, 0x07c107bf},
+-      {0x0000b1a4, 0x000007c0},
+-      {0x0000b1a8, 0x00000000},
+-      {0x0000b1ac, 0x00000000},
+-      {0x0000b1b0, 0x00000000},
+-      {0x0000b1b4, 0x00000000},
+-      {0x0000b1b8, 0x00000000},
+-      {0x0000b1bc, 0x00000000},
+-      {0x0000b1c0, 0x00000000},
+-      {0x0000b1c4, 0x00000000},
+-      {0x0000b1c8, 0x00000000},
+-      {0x0000b1cc, 0x00000000},
+-      {0x0000b1d0, 0x00000000},
+-      {0x0000b1d4, 0x00000000},
+-      {0x0000b1d8, 0x00000000},
+-      {0x0000b1dc, 0x00000000},
+-      {0x0000b1e0, 0x00000000},
+-      {0x0000b1e4, 0x00000000},
+-      {0x0000b1e8, 0x00000000},
+-      {0x0000b1ec, 0x00000000},
+-      {0x0000b1f0, 0x00000396},
+-      {0x0000b1f4, 0x00000396},
+-      {0x0000b1f8, 0x00000396},
+-      {0x0000b1fc, 0x00000196},
+-};
+-
+ static const u32 ar955x_1p0_soc_preamble[][2] = {
+       /* Addr      allmodes  */
+       {0x00007000, 0x00000000},
+@@ -1263,11 +744,6 @@ static const u32 ar955x_1p0_modes_no_xpa
+       {0x00016848, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
+ };
+-static const u32 ar955x_1p0_soc_postamble[][5] = {
+-      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
+-};
+-
+ static const u32 ar955x_1p0_modes_fast_clock[][3] = {
+       /* Addr      5G_HT20     5G_HT40   */
+       {0x00001030, 0x00000268, 0x000004d0},
+--- a/drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
+@@ -20,6 +20,12 @@
  
- #define AR_SREV_5416(_ah) \
-@@ -927,10 +929,18 @@
+ /* AR9565 1.0 */
  
- #define AR_SREV_9565(_ah) \
-       (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565))
++#define ar9565_1p0_mac_postamble ar9331_1p1_mac_postamble
++
++#define ar9565_1p0_Modes_lowest_ob_db_tx_gain_table ar9565_1p0_modes_low_ob_db_tx_gain_table
++
++#define ar9565_1p0_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484
++
+ static const u32 ar9565_1p0_mac_core[][2] = {
+       /* Addr      allmodes  */
+       {0x00000008, 0x00000000},
+@@ -182,18 +188,6 @@ static const u32 ar9565_1p0_mac_core[][2
+       {0x000083d0, 0x800301ff},
+ };
+-static const u32 ar9565_1p0_mac_postamble[][5] = {
+-      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
+-      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
+-      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
+-      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
+-      {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
+-      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
+-      {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
+-      {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
+-};
 -
- #define AR_SREV_9565_10(_ah) \
-       (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565) && \
-        ((_ah)->hw_version.macRev == AR_SREV_REVISION_9565_10))
-+#define AR_SREV_9565_101(_ah) \
-+      (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565) && \
-+       ((_ah)->hw_version.macRev == AR_SREV_REVISION_9565_101))
-+#define AR_SREV_9565_11(_ah) \
-+      (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565) && \
-+       ((_ah)->hw_version.macRev == AR_SREV_REVISION_9565_11))
-+#define AR_SREV_9565_11_OR_LATER(_ah) \
-+      (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565) && \
-+       ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9565_11))
+ static const u32 ar9565_1p0_baseband_core[][2] = {
+       /* Addr      allmodes  */
+       {0x00009800, 0xafe68e30},
+@@ -711,66 +705,6 @@ static const u32 ar9565_1p0_Common_rx_ga
+       {0x0000b1fc, 0x00000196},
+ };
  
- #define AR_SREV_9550(_ah) \
-       (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9550))
+-static const u32 ar9565_1p0_Modes_lowest_ob_db_tx_gain_table[][5] = {
+-      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-      {0x0000a2dc, 0xfc0a9380, 0xfc0a9380, 0xfdab5b52, 0xfdab5b52},
+-      {0x0000a2e0, 0xffecec00, 0xffecec00, 0xfd339c84, 0xfd339c84},
+-      {0x0000a2e4, 0xfc0f0000, 0xfc0f0000, 0xfec3e000, 0xfec3e000},
+-      {0x0000a2e8, 0xfc100000, 0xfc100000, 0xfffc0000, 0xfffc0000},
+-      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+-      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
+-      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
+-      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
+-      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
+-      {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
+-      {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
+-      {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
+-      {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
+-      {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
+-      {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
+-      {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
+-      {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
+-      {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
+-      {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
+-      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
+-      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
+-      {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
+-      {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
+-      {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
+-      {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
+-      {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
+-      {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
+-      {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
+-      {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
+-      {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+-      {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a614, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a618, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a61c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a620, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a624, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a628, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a62c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a630, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a634, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a638, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x0000a63c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x00016044, 0x012482d4, 0x012482d4, 0x012482d4, 0x012482d4},
+-      {0x00016048, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-      {0x00016054, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-};
+-
+ static const u32 ar9565_1p0_pciephy_clkreq_disable_L1[][2] = {
+       /* Addr      allmodes  */
+       {0x00018c00, 0x18212ede},
+@@ -1231,11 +1165,4 @@ static const u32 ar9565_1p0_modes_high_p
+       {0x00016054, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ };
+-static const u32 ar9565_1p0_baseband_core_txfir_coeff_japan_2484[][2] = {
+-      /* Addr      allmodes  */
+-      {0x0000a398, 0x00000000},
+-      {0x0000a39c, 0x6f7f0301},
+-      {0x0000a3a0, 0xca9228ee},
+-};
+-
+ #endif /* INITVALS_9565_1P0_H */
+--- a/include/linux/ath9k_platform.h
++++ b/include/linux/ath9k_platform.h
+@@ -32,6 +32,8 @@ struct ath9k_platform_data {
+       u32 gpio_val;
+       bool is_clk_25mhz;
++      bool tx_gain_buffalo;
++
+       int (*get_mac_revision)(void);
+       int (*external_reset)(void);
+ };
+--- /dev/null
++++ b/drivers/net/wireless/ath/ath9k/ar9003_buffalo_initvals.h
+@@ -0,0 +1,126 @@
++/*
++ * Copyright (c) 2013 Qualcomm Atheros Inc.
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef INITVALS_9003_BUFFALO_H
++#define INITVALS_9003_BUFFALO_H
++
++static const u32 ar9300Modes_high_power_tx_gain_table_buffalo[][5] = {
++      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
++      {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++      {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++      {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
++      {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
++      {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
++      {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
++      {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
++      {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
++      {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
++      {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
++      {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
++      {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
++      {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
++      {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
++      {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
++      {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
++      {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
++      {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
++      {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
++      {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
++      {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
++      {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
++      {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
++      {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
++      {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
++      {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
++      {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
++      {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
++      {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
++      {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++      {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++      {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++      {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++      {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++      {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++      {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++      {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
++      {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
++      {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
++      {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
++      {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
++      {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
++      {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
++      {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
++      {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
++      {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
++      {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
++      {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
++      {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
++      {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
++      {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
++      {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
++      {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
++      {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
++      {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
++      {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
++      {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
++      {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
++      {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
++      {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
++      {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
++      {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++      {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++      {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++      {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++      {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++      {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++      {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++      {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
++      {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
++      {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
++      {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
++      {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
++      {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
++      {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
++      {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++      {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++      {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++      {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++      {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++      {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++      {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++      {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
++      {0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++      {0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++      {0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++      {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
++      {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
++      {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
++      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
++      {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
++      {0x00016448, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
++      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
++      {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
++      {0x00016848, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
++      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
++};
++
++#endif /* INITVALS_9003_BUFFALO_H */
index 70c2cbb..a4c73e2 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -849,6 +849,7 @@ static const struct ieee80211_iface_limi
+@@ -867,6 +867,7 @@ static const struct ieee80211_iface_limi
  #endif
                                 BIT(NL80211_IFTYPE_AP) |
                                 BIT(NL80211_IFTYPE_P2P_GO) },
index 0eaffdd..eb7f73a 100644 (file)
@@ -71,7 +71,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -728,6 +728,7 @@ enum ath_cal_list {
+@@ -729,6 +729,7 @@ enum ath_cal_list {
  #define AH_USE_EEPROM   0x1
  #define AH_UNPLUGGED    0x2 /* The card has been physically removed. */
  #define AH_FASTCC       0x4
@@ -81,7 +81,7 @@
        struct ath_ops reg_ops;
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -700,6 +700,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -721,6 +721,8 @@ static int ath9k_init_softc(u16 devid, s
                ah->is_clk_25mhz = pdata->is_clk_25mhz;
                ah->get_mac_revision = pdata->get_mac_revision;
                ah->external_reset = pdata->external_reset;
@@ -98,5 +98,5 @@
  
 +      bool endian_check;
        bool is_clk_25mhz;
-       int (*get_mac_revision)(void);
-       int (*external_reset)(void);
+       bool tx_gain_buffalo;
index f45fd28..1f50580 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -1092,23 +1092,23 @@ static int __init ath9k_init(void)
+@@ -1110,23 +1110,23 @@ static int __init ath9k_init(void)
                goto err_out;
        }
  
index 81fb2ed..41081dc 100644 (file)
  void ath_fill_led_pin(struct ath_softc *sc)
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -998,7 +998,7 @@ int ath9k_init_device(u16 devid, struct 
+@@ -1016,7 +1016,7 @@ int ath9k_init_device(u16 devid, struct 
  
  #ifdef CPTCFG_MAC80211_LEDS
        /* must be initialized before ieee80211_register_hw */
index 764242c..6c9832c 100644 (file)
@@ -1,7 +1,7 @@
 --- a/include/linux/ath9k_platform.h
 +++ b/include/linux/ath9k_platform.h
-@@ -35,6 +35,9 @@ struct ath9k_platform_data {
-       bool is_clk_25mhz;
+@@ -37,6 +37,9 @@ struct ath9k_platform_data {
        int (*get_mac_revision)(void);
        int (*external_reset)(void);
 +
index f5ef8fb..0a43af1 100644 (file)
@@ -62,7 +62,7 @@
        debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -481,6 +481,12 @@ enum {
+@@ -482,6 +482,12 @@ enum {
        ATH9K_RESET_COLD,
  };
  
@@ -75,7 +75,7 @@
  struct ath9k_hw_version {
        u32 magic;
        u16 devid;
-@@ -766,6 +772,8 @@ struct ath_hw {
+@@ -767,6 +773,8 @@ struct ath_hw {
        u32 rfkill_polarity;
        u32 ah_flags;
  
@@ -84,7 +84,7 @@
        bool reset_power_on;
        bool htc_reset_init;
  
-@@ -1017,6 +1025,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
+@@ -1019,6 +1027,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
  bool ath9k_hw_check_alive(struct ath_hw *ah);
  
  bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);
index 7eebe07..f33ff92 100644 (file)
@@ -1,15 +1,14 @@
 --- a/include/linux/ath9k_platform.h
 +++ b/include/linux/ath9k_platform.h
-@@ -33,6 +33,9 @@ struct ath9k_platform_data {
+@@ -34,6 +34,8 @@ struct ath9k_platform_data {
        bool endian_check;
        bool is_clk_25mhz;
+       bool tx_gain_buffalo;
 +      bool disable_2ghz;
 +      bool disable_5ghz;
-+
        int (*get_mac_revision)(void);
        int (*external_reset)(void);
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
 @@ -2458,17 +2458,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
@@ -48,7 +47,7 @@
            AR_SREV_9285(ah) ||
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -936,6 +936,8 @@ struct ath_hw {
+@@ -938,6 +938,8 @@ struct ath_hw {
        bool is_clk_25mhz;
        int (*get_mac_revision)(void);
        int (*external_reset)(void);
@@ -59,7 +58,7 @@
  };
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -700,6 +700,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -721,6 +721,8 @@ static int ath9k_init_softc(u16 devid, s
                ah->is_clk_25mhz = pdata->is_clk_25mhz;
                ah->get_mac_revision = pdata->get_mac_revision;
                ah->external_reset = pdata->external_reset;
index ac3ddd7..f264062 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -683,6 +683,7 @@ struct ath_spec_scan {
+@@ -684,6 +684,7 @@ struct ath_spec_scan {
   * @config_pci_powersave:
   * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
   *
@@ -8,7 +8,7 @@
   * @spectral_scan_config: set parameters for spectral scan and enable/disable it
   * @spectral_scan_trigger: trigger a spectral scan run
   * @spectral_scan_wait: wait for a spectral scan run to finish
-@@ -705,6 +706,7 @@ struct ath_hw_ops {
+@@ -706,6 +707,7 @@ struct ath_hw_ops {
                        struct ath_hw_antcomb_conf *antconf);
        void (*antdiv_comb_conf_set)(struct ath_hw *ah,
                        struct ath_hw_antcomb_conf *antconf);
@@ -18,7 +18,7 @@
        void (*spectral_scan_trigger)(struct ath_hw *ah);
 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -1760,6 +1760,26 @@ static void ar9003_hw_tx99_set_txpower(s
+@@ -1766,6 +1766,26 @@ static void ar9003_hw_tx99_set_txpower(s
                  ATH9K_POW_SM(p_pwr_array[ALL_TARGET_HT40_14],  0));
  }
  
@@ -45,7 +45,7 @@
  void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
  {
        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
-@@ -1790,6 +1810,7 @@ void ar9003_hw_attach_phy_ops(struct ath
+@@ -1796,6 +1816,7 @@ void ar9003_hw_attach_phy_ops(struct ath
        priv_ops->set_radar_params = ar9003_hw_set_radar_params;
        priv_ops->fast_chan_change = ar9003_hw_fast_chan_change;
  
@@ -55,7 +55,7 @@
        ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -829,7 +829,8 @@ static void ath9k_init_txpower_limits(st
+@@ -847,7 +847,8 @@ static void ath9k_init_txpower_limits(st
        if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
                ath9k_init_band_txpower(sc, IEEE80211_BAND_5GHZ);
  
@@ -65,7 +65,7 @@
  }
  
  void ath9k_reload_chainmask_settings(struct ath_softc *sc)
-@@ -960,6 +961,18 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -978,6 +979,18 @@ void ath9k_set_hw_capab(struct ath_softc
        SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
  }
  
@@ -84,7 +84,7 @@
  int ath9k_init_device(u16 devid, struct ath_softc *sc,
                    const struct ath_bus_ops *bus_ops)
  {
-@@ -1005,6 +1018,8 @@ int ath9k_init_device(u16 devid, struct 
+@@ -1023,6 +1036,8 @@ int ath9k_init_device(u16 devid, struct 
                ARRAY_SIZE(ath9k_tpt_blink));
  #endif
  
index 03b63c9..a559d73 100644 (file)
@@ -13,6 +13,7 @@
 #include <linux/gpio.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/ath9k_platform.h>
 
 #include <asm/mach-ath79/ath79.h>
 
@@ -153,6 +154,8 @@ static void __init wzrhpg450h_init(void)
        ath79_register_usb();
 
        ap91_pci_init(ee, NULL);
+       ap9x_pci_get_wmac_data(0)->tx_gain_buffalo = true;
+       ap9x_pci_get_wmac_data(1)->tx_gain_buffalo = true;
        ap9x_pci_setup_wmac_led_pin(0, 15);
        ap9x_pci_setup_wmac_leds(0, wzrhpg450h_wmac_leds_gpio,
                                 ARRAY_SIZE(wzrhpg450h_wmac_leds_gpio));
index a0b7531..3498780 100644 (file)
@@ -33,6 +33,7 @@ struct ath9k_platform_data {
 
        bool endian_check;
        bool is_clk_25mhz;
+       bool tx_gain_buffalo;
        bool disable_2ghz;
        bool disable_5ghz;