2 files changed, 12 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index d582cf73098f..02cc1ce3dd6a 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2390,8 +2390,17 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 if (AR_SREV_9485_OR_LATER(ah))
                         ah->enabled_cals |= TX_IQ_ON_AGC_CAL;
         }
-        if (AR_SREV_9462(ah))
-                pCap->hw_caps |= ATH9K_HW_CAP_RTT | ATH9K_HW_CAP_MCI;
+
+        if (AR_SREV_9462(ah)) {
+
+                if (!(ah->ent_mode & AR_ENT_OTP_49GHZ_DISABLE))
+                        pCap->hw_caps |= ATH9K_HW_CAP_MCI;
+
+                if (AR_SREV_9462_20(ah))
+                        pCap->hw_caps |= ATH9K_HW_CAP_RTT;
+
+        }
+
 
         return 0;
 }
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 80b1856f817d..458f81b4a7cb 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -1151,6 +1151,7 @@ enum {
 #define AR_INTR_PRIO_ASYNC_ENABLE (AR_SREV_9340(ah) ? 0x4094 : 0x40d4)
 #define AR_ENT_OTP                0x40d8
 #define AR_ENT_OTP_CHAIN2_DISABLE               0x00020000
+#define AR_ENT_OTP_49GHZ_DISABLE                0x00100000
 #define AR_ENT_OTP_MIN_PKT_SIZE_DISABLE         0x00800000
 
 #define AR_CH0_BB_DPLL1          0x16180