1 files changed, 16 insertions, 13 deletions

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 3aed729e4d5e..8be4b1453394 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -222,31 +222,28 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
 {
         u32 val;
 
+        if (ah->get_mac_revision)
+                ah->hw_version.macRev = ah->get_mac_revision();
+
         switch (ah->hw_version.devid) {
         case AR5416_AR9100_DEVID:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9100;
                 break;
         case AR9300_DEVID_AR9330:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9330;
-                if (ah->get_mac_revision) {
-                        ah->hw_version.macRev = ah->get_mac_revision();
-                } else {
+                if (!ah->get_mac_revision) {
                         val = REG_READ(ah, AR_SREV);
                         ah->hw_version.macRev = MS(val, AR_SREV_REVISION2);
                 }
                 return;
         case AR9300_DEVID_AR9340:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9340;
-                val = REG_READ(ah, AR_SREV);
-                ah->hw_version.macRev = MS(val, AR_SREV_REVISION2);
                 return;
         case AR9300_DEVID_QCA955X:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9550;
                 return;
         case AR9300_DEVID_AR953X:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9531;
-                if (ah->get_mac_revision)
-                        ah->hw_version.macRev = ah->get_mac_revision();
                 return;
         }
 
@@ -704,6 +701,8 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
 {
         u32 pll;
 
+        pll = ath9k_hw_compute_pll_control(ah, chan);
+
         if (AR_SREV_9485(ah) || AR_SREV_9565(ah)) {
                 /* program BB PLL ki and kd value, ki=0x4, kd=0x40 */
                 REG_RMW_FIELD(ah, AR_CH0_BB_DPLL2,
@@ -754,7 +753,8 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
                 REG_RMW_FIELD(ah, AR_CH0_DDR_DPLL3,
                               AR_CH0_DPLL3_PHASE_SHIFT, 0x1);
 
-                REG_WRITE(ah, AR_RTC_PLL_CONTROL, 0x1142c);
+                REG_WRITE(ah, AR_RTC_PLL_CONTROL,
+                          pll | AR_RTC_9300_PLL_BYPASS);
                 udelay(1000);
 
                 /* program refdiv, nint, frac to RTC register */
@@ -770,7 +770,8 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
         } else if (AR_SREV_9340(ah) || AR_SREV_9550(ah) || AR_SREV_9531(ah)) {
                 u32 regval, pll2_divint, pll2_divfrac, refdiv;
 
-                REG_WRITE(ah, AR_RTC_PLL_CONTROL, 0x1142c);
+                REG_WRITE(ah, AR_RTC_PLL_CONTROL,
+                          pll | AR_RTC_9300_SOC_PLL_BYPASS);
                 udelay(1000);
 
                 REG_SET_BIT(ah, AR_PHY_PLL_MODE, 0x1 << 16);
@@ -843,7 +844,6 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
                 udelay(1000);
         }
 
-        pll = ath9k_hw_compute_pll_control(ah, chan);
         if (AR_SREV_9565(ah))
                 pll |= 0x40000;
         REG_WRITE(ah, AR_RTC_PLL_CONTROL, pll);
@@ -1192,9 +1192,12 @@ static void ath9k_hw_set_operating_mode(struct ath_hw *ah, int opmode)
 
         switch (opmode) {
         case NL80211_IFTYPE_ADHOC:
-                set |= AR_STA_ID1_ADHOC;
-                REG_SET_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
-                break;
+                if (!AR_SREV_9340_13(ah)) {
+                        set |= AR_STA_ID1_ADHOC;
+                        REG_SET_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
+                        break;
+                }
+                /* fall through */
         case NL80211_IFTYPE_MESH_POINT:
         case NL80211_IFTYPE_AP:
                 set |= AR_STA_ID1_STA_AP;