diff mbox series

[01/36] wcn36xx: Add ability to identify WCN3680

Message ID 20200803031132.1427063-2-bryan.odonoghue@linaro.org (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show
Series wcn36xx: Add support for WCN3680 802.11ac | expand

Commit Message

Bryan O'Donoghue Aug. 3, 2020, 3:10 a.m. UTC
The WCN3680 has some specific behaviours that we want to capture to
distinguish it from the WCN3620 and WCN3660 respectively.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 drivers/net/wireless/ath/wcn36xx/main.c    | 2 ++
 drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 +
 2 files changed, 3 insertions(+)

Comments

Kalle Valo Aug. 26, 2020, 3:28 p.m. UTC | #1
Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote:

> The WCN3680 has some specific behaviours that we want to capture to
> distinguish it from the WCN3620 and WCN3660 respectively.
> 
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

First 8 patches already failed to apply:

error: patch failed: drivers/net/wireless/ath/wcn36xx/txrx.c:272
error: drivers/net/wireless/ath/wcn36xx/txrx.c: patch does not apply
stg import: Diff does not apply cleanly

8 patches set to Changes Requested.

11696999 [01/36] wcn36xx: Add ability to identify WCN3680
11697001 [02/36] wcn36xx: Add ieee802.11 VHT flags
11697003 [03/36] wcn36xx: Add 802.11ac MCS rates
11697005 [04/36] wcn36xx: Specify ieee80211_rx_status.nss
11697007 [05/36] wcn36xx: Add 802.11ac HAL param bitfields
11697009 [06/36] wcn36xx: Add Supported rates V1 structure
11697011 [07/36] wcn36xx: Use existing pointers in wcn36xx_smd_config_bss_v1
11697013 [08/36] wcn36xx: Set feature DOT11AC for wcn3680
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index f389cd4676e3..73ba30a4d727 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1298,6 +1298,8 @@  static int wcn36xx_platform_get_resources(struct wcn36xx *wcn,
 	if (iris_node) {
 		if (of_device_is_compatible(iris_node, "qcom,wcn3620"))
 			wcn->rf_id = RF_IRIS_WCN3620;
+		if (of_device_is_compatible(iris_node, "qcom,wcn3680"))
+			wcn->rf_id = RF_IRIS_WCN3680;
 		of_node_put(iris_node);
 	}
 
diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
index 3221fed15620..821c4ce61afd 100644
--- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
+++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
@@ -92,6 +92,7 @@  enum wcn36xx_ampdu_state {
 
 #define RF_UNKNOWN	0x0000
 #define RF_IRIS_WCN3620	0x3620
+#define RF_IRIS_WCN3680	0x3680
 
 static inline void buff_to_be(u32 *buf, size_t len)
 {