3 files changed, 11 insertions, 0 deletions

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index a3881b64f766..9840e0051084 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -251,6 +251,15 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
         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 {
+                        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);
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 14c5857a020c..0749fa8c3a58 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -862,6 +862,7 @@ struct ath_hw {
         u32 ent_mode;
 
         bool is_clk_25mhz;
+        int (*get_mac_revision)(void);
 };
 
 struct ath_bus_ops {
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index d4b166cfdf60..661211291773 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -574,6 +574,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
                 sc->sc_ah->gpio_val = pdata->gpio_val;
                 sc->sc_ah->led_pin = pdata->led_pin;
                 ah->is_clk_25mhz = pdata->is_clk_25mhz;
+                ah->get_mac_revision = pdata->get_mac_revision;
         }
 
         common = ath9k_hw_common(ah);