ath9k: Add HW IDs for QCA956x

Signed-off-by: Miaoqing Pan <miaoqing@qca.qualcomm.com>
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index e000c4c2788158edb25d6f086004ebe2517fa4bf..bd4a1a655f42d4093360df93201b360064a39698 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -43,6 +43,10 @@ static const struct platform_device_id ath9k_platform_id_table[] = {
                .name = "qca953x_wmac",
                .driver_data = AR9300_DEVID_AR953X,
        },
+       {
+               .name = "qca956x_wmac",
+               .driver_data = AR9300_DEVID_QCA956X,
+       },
        {},
 };
 

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 258c4d236cbee544409ac2b1aa831b802734dc74..916b370be033236ee15dd014eb9bc5a7cfd427f9 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -246,6 +246,8 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
        case AR9300_DEVID_AR953X:
                ah->hw_version.macVersion = AR_SREV_VERSION_9531;
                return;
+       case AR9300_DEVID_QCA956X:
+               ah->hw_version.macVersion = AR_SREV_VERSION_9561;
        }
 
        val = REG_READ(ah, AR_SREV) & AR_SREV_ID;
@@ -539,6 +541,7 @@ static int __ath9k_hw_init(struct ath_hw *ah)
        case AR_SREV_VERSION_9550:
        case AR_SREV_VERSION_9565:
        case AR_SREV_VERSION_9531:
+       case AR_SREV_VERSION_9561:
                break;
        default:
                ath_err(common,
@@ -639,6 +642,7 @@ int ath9k_hw_init(struct ath_hw *ah)
        case AR9485_DEVID_AR1111:
        case AR9300_DEVID_AR9565:
        case AR9300_DEVID_AR953X:
+       case AR9300_DEVID_QCA956X:
                break;
        default:
                if (common->bus_ops->ath_bus_type == ATH_USB)

diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 1cbd335515134e0d4c5ccbfd7fa8756c01a9801b..64bfcbd9fcec5eddb33f64a5dd1f8bc6044ab41f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -54,6 +54,7 @@
 #define AR9485_DEVID_AR1111    0x0037
 #define AR9300_DEVID_AR9565     0x0036
 #define AR9300_DEVID_AR953X     0x003d
+#define AR9300_DEVID_QCA956X    0x003f
 
 #define AR5416_AR9100_DEVID    0x000b
 

diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index fb11a9172f38a917878f16c06ec84b6dbeddfcfe..eb2bb0db297f7409d0b2e33452a2fa2abdd7e7a1 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -814,6 +814,7 @@
 #define AR_SREV_REVISION_9531_10        0
 #define AR_SREV_REVISION_9531_11        1
 #define AR_SREV_REVISION_9531_20        2
+#define AR_SREV_VERSION_9561            0x600
 
 #define AR_SREV_5416(_ah) \
        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \
@@ -974,6 +975,9 @@
        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531) && \
         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9531_20))
 
+#define AR_SREV_9561(_ah) \
+       (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9561))
+
 /* NOTE: When adding chips newer than Peacock, add chip check here */
 #define AR_SREV_9580_10_OR_LATER(_ah) \
        (AR_SREV_9580(_ah))