1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 70e27d2a5e43..bc992b237ae5 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -679,18 +679,17 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
          * different modal values.
          */
         if (IS_CHAN_A_FAST_CLOCK(ah, chan))
-                REG_WRITE_ARRAY(&ah->iniModesAdditional,
+                REG_WRITE_ARRAY(&ah->iniModesFastClock,
                                 modesIndex, regWrites);
 
-        if (AR_SREV_9330(ah))
-                REG_WRITE_ARRAY(&ah->iniModesAdditional, 1, regWrites);
-
-        if (AR_SREV_9340(ah) && !ah->is_clk_25mhz)
-                REG_WRITE_ARRAY(&ah->iniModesAdditional_40M, 1, regWrites);
+        REG_WRITE_ARRAY(&ah->iniAdditional, 1, regWrites);
 
         if (AR_SREV_9462(ah))
                 ar9003_hw_prog_ini(ah, &ah->ini_BTCOEX_MAX_TXPWR, 1);
 
+        if (chan->channel == 2484)
+                ar9003_hw_prog_ini(ah, &ah->ini_japan2484, 1);
+
         ah->modes_index = modesIndex;
         ar9003_hw_override_ini(ah);
         ar9003_hw_set_channel_regs(ah, chan);
@@ -1320,13 +1319,9 @@ static int ar9003_hw_fast_chan_change(struct ath_hw *ah,
          * different modal values.
          */
         if (IS_CHAN_A_FAST_CLOCK(ah, chan))
-                REG_WRITE_ARRAY(&ah->iniModesAdditional, modesIndex, regWrites);
-
-        if (AR_SREV_9330(ah))
-                REG_WRITE_ARRAY(&ah->iniModesAdditional, 1, regWrites);
+                REG_WRITE_ARRAY(&ah->iniModesFastClock, modesIndex, regWrites);
 
-        if (AR_SREV_9340(ah) && !ah->is_clk_25mhz)
-                REG_WRITE_ARRAY(&ah->iniModesAdditional_40M, 1, regWrites);
+        REG_WRITE_ARRAY(&ah->iniAdditional, 1, regWrites);
 
         ah->modes_index = modesIndex;
         *ini_reloaded = true;