Commit 98d504a8 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Kalle Valo
Browse files

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: 8490987b ("wcn36xx: Hook and identify RF_IRIS_WCN3680")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarLoic Poulain <loic.poulain@linaro.org>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220125004046.4058284-1-bryan.odonoghue@linaro.org
parent 3df6d74a

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

+3 −0
Original line number Diff line number Diff line
@@ -1583,6 +1583,9 @@ 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,wcn3660") ||

		    of_device_is_compatible(iris_node, "qcom,wcn3660b"))

			wcn->rf_id = RF_IRIS_WCN3660;

		if (of_device_is_compatible(iris_node, "qcom,wcn3680"))

			wcn->rf_id = RF_IRIS_WCN3680;

		of_node_put(iris_node);

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

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ enum wcn36xx_ampdu_state { 


#define RF_UNKNOWN	0x0000

#define RF_IRIS_WCN3620	0x3620

#define RF_IRIS_WCN3660	0x3660

#define RF_IRIS_WCN3680	0x3680



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