Skip to content

Commit 98d504a

Browse files
0xB0Dkvalo
authored andcommitted
wcn36xx: Differentiate wcn3660 from wcn3620
The spread of capability between the three WiFi silicon parts wcn36xx supports is: wcn3620 - 802.11 a/b/g wcn3660 - 802.11 a/b/g/n wcn3680 - 802.11 a/b/g/n/ac We currently treat wcn3660 as wcn3620 thus limiting it to 2GHz channels. Fix this regression by ensuring we differentiate between all three parts. Fixes: 8490987 ("wcn36xx: Hook and identify RF_IRIS_WCN3680") Cc: [email protected] Signed-off-by: Bryan O'Donoghue <[email protected]> Reviewed-by: Loic Poulain <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 3df6d74 commit 98d504a

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

drivers/net/wireless/ath/wcn36xx/main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,6 +1583,9 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn,
15831583
if (iris_node) {
15841584
if (of_device_is_compatible(iris_node, "qcom,wcn3620"))
15851585
wcn->rf_id = RF_IRIS_WCN3620;
1586+
if (of_device_is_compatible(iris_node, "qcom,wcn3660") ||
1587+
of_device_is_compatible(iris_node, "qcom,wcn3660b"))
1588+
wcn->rf_id = RF_IRIS_WCN3660;
15861589
if (of_device_is_compatible(iris_node, "qcom,wcn3680"))
15871590
wcn->rf_id = RF_IRIS_WCN3680;
15881591
of_node_put(iris_node);

drivers/net/wireless/ath/wcn36xx/wcn36xx.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ enum wcn36xx_ampdu_state {
9797

9898
#define RF_UNKNOWN 0x0000
9999
#define RF_IRIS_WCN3620 0x3620
100+
#define RF_IRIS_WCN3660 0x3660
100101
#define RF_IRIS_WCN3680 0x3680
101102

102103
static inline void buff_to_be(u32 *buf, size_t len)

0 commit comments

Comments
 (0)