Skip to content

Commit cdb9644

Browse files
0xB0Dgregkh
authored andcommitted
wcn36xx: Differentiate wcn3660 from wcn3620
commit 98d504a upstream. 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: stable@vger.kernel.org Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Reviewed-by: Loic Poulain <loic.poulain@linaro.org> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Link: https://lore.kernel.org/r/20220125004046.4058284-1-bryan.odonoghue@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 476ddd2 commit cdb9644

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,6 +1474,9 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn,
14741474
if (iris_node) {
14751475
if (of_device_is_compatible(iris_node, "qcom,wcn3620"))
14761476
wcn->rf_id = RF_IRIS_WCN3620;
1477+
if (of_device_is_compatible(iris_node, "qcom,wcn3660") ||
1478+
of_device_is_compatible(iris_node, "qcom,wcn3660b"))
1479+
wcn->rf_id = RF_IRIS_WCN3660;
14771480
if (of_device_is_compatible(iris_node, "qcom,wcn3680"))
14781481
wcn->rf_id = RF_IRIS_WCN3680;
14791482
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)