package/mac80211/patches/540-ath9k-define-mac-version-for-AR9330.patch

   1 diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
   2 index 1be7c8b..05c2ba2 100644
   3 --- a/drivers/net/wireless/ath/ath9k/hw.c
   4 +++ b/drivers/net/wireless/ath/ath9k/hw.c
   5 @@ -551,6 +551,7 @@ static int __ath9k_hw_init(struct ath_hw *ah)
   6         case AR_SREV_VERSION_9287:
   7         case AR_SREV_VERSION_9271:
   8         case AR_SREV_VERSION_9300:
   9 +       case AR_SREV_VERSION_9330:
  10         case AR_SREV_VERSION_9485:
  11         case AR_SREV_VERSION_9340:
  12                 break;
  13 @@ -561,7 +562,8 @@ static int __ath9k_hw_init(struct ath_hw *ah)
  14                 return -EOPNOTSUPP;
  15         }
  16
  17 -       if (AR_SREV_9271(ah) || AR_SREV_9100(ah) || AR_SREV_9340(ah))
  18 +       if (AR_SREV_9271(ah) || AR_SREV_9100(ah) || AR_SREV_9340(ah) ||
  19 +           AR_SREV_9330(ah))
  20                 ah->is_pciexpress = false;
  21
  22         ah->hw_version.phyRev = REG_READ(ah, AR_PHY_CHIP_ID);
  23 @@ -2574,6 +2576,7 @@ static struct {
  24         { AR_SREV_VERSION_9287,         "9287" },
  25         { AR_SREV_VERSION_9271,         "9271" },
  26         { AR_SREV_VERSION_9300,         "9300" },
  27 +       { AR_SREV_VERSION_9330,         "9330" },
  28         { AR_SREV_VERSION_9485,         "9485" },
  29  };
  30
  31 diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
  32 index c18ee99..a483388 100644
  33 --- a/drivers/net/wireless/ath/ath9k/reg.h
  34 +++ b/drivers/net/wireless/ath/ath9k/reg.h
  35 @@ -788,6 +788,10 @@
  36  #define AR_SREV_REVISION_9271_11       1
  37  #define AR_SREV_VERSION_9300           0x1c0
  38  #define AR_SREV_REVISION_9300_20       2 /* 2.0 and 2.1 */
  39 +#define AR_SREV_VERSION_9330           0x200
  40 +#define AR_SREV_REVISION_9330_10       0
  41 +#define AR_SREV_REVISION_9330_11       1
  42 +#define AR_SREV_REVISION_9330_12       2
  43  #define AR_SREV_VERSION_9485           0x240
  44  #define AR_SREV_REVISION_9485_10       0
  45  #define AR_SREV_REVISION_9485_11        1
  46 @@ -862,6 +866,18 @@
  47  #define AR_SREV_9300_20_OR_LATER(_ah) \
  48         ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9300)
  49
  50 +#define AR_SREV_9330(_ah) \
  51 +       (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9330))
  52 +#define AR_SREV_9330_10(_ah) \
  53 +       (AR_SREV_9330((_ah)) && \
  54 +        ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_10))
  55 +#define AR_SREV_9330_11(_ah) \
  56 +       (AR_SREV_9330((_ah)) && \
  57 +        ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_11))
  58 +#define AR_SREV_9330_12(_ah) \
  59 +       (AR_SREV_9330((_ah)) && \
  60 +        ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_12))
  61 +
  62  #define AR_SREV_9485(_ah) \
  63         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9485))
  64  #define AR_SREV_9485_10(_ah) \