ath9k: Fix AR9285 specific noise floor eeprom reads.

Fix AR9285 specific noise floor reads and initialize tx and rx
chainmask during reset. This along with the following earlier
patches of ath9k fixes an issue with association noticed in
noisy environment.

ath9k: Fix typo in chip version check
ath9k: Remove unnecessary gpio configuration in ath9k_hw_reset()
ath9k: Fix bug in NF calibration

Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index bb8628c7efa1..77282345efc1 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -2165,7 +2165,10 @@ int ath9k_hw_reset(struct ath_hal *ah, struct ath9k_channel *chan,
         ahp->ah_txchainmask = sc->sc_tx_chainmask;
         ahp->ah_rxchainmask = sc->sc_rx_chainmask;
 
-        if (AR_SREV_9280(ah)) {
+        if (AR_SREV_9285(ah)) {
+                ahp->ah_txchainmask &= 0x1;
+                ahp->ah_rxchainmask &= 0x1;
+        } else if (AR_SREV_9280(ah)) {
                 ahp->ah_txchainmask &= 0x3;
                 ahp->ah_rxchainmask &= 0x3;
         }