ath9k_hw: Configure RF channel freqency for AR9340

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 20 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 0b999f94cd95..ea2f60c08f8b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -86,14 +86,31 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
                         channelSel = (freq * 4) / 120;
                         chan_frac = (((freq * 4) % 120) * 0x20000) / 120;
                         channelSel = (channelSel << 17) | chan_frac;
+                } else if (AR_SREV_9340(ah)) {
+                        if (ah->is_clk_25mhz) {
+                                u32 chan_frac;
+
+                                channelSel = (freq * 2) / 75;
+                                chan_frac = (((freq * 2) % 75) * 0x20000) / 75;
+                                channelSel = (channelSel << 17) | chan_frac;
+                        } else
+                                channelSel = CHANSEL_2G(freq) >> 1;
                 } else
                         channelSel = CHANSEL_2G(freq);
                 /* Set to 2G mode */
                 bMode = 1;
         } else {
-                channelSel = CHANSEL_5G(freq);
-                /* Doubler is ON, so, divide channelSel by 2. */
-                channelSel >>= 1;
+                if (AR_SREV_9340(ah) && ah->is_clk_25mhz) {
+                        u32 chan_frac;
+
+                        channelSel = (freq * 2) / 75;
+                        chan_frac = ((freq % 75) * 0x20000) / 75;
+                        channelSel = (channelSel << 17) | chan_frac;
+                } else {
+                        channelSel = CHANSEL_5G(freq);
+                        /* Doubler is ON, so, divide channelSel by 2. */
+                        channelSel >>= 1;
+                }
                 /* Set to 5G mode */
                 bMode = 0;
         }