Fix wcn36xx on msm8916-samsung-a5u
Subsystems (4)
cover Fix wcn36xx on msm8916-samsung-a5u
Unlike most MSM8916 boards, samsung-a5u uses WCN3660B instead of WCN3620 to support the 5 GHz band additionally.
WCN3660B has similar requirements as WCN3620, but it needs the XO clock to run at 48 MHz instead of 19.2 MHz. So far it was possible to describe that configuration using the qcom,wcn3680 compatible.
However, as of commit 8490987bdb9a ("wcn36xx: Hook and identify RF_IRIS_WCN3680"), the wcn36xx driver will now use the qcom,wcn3680 compatible
to enable functionality specific to WCN3680. In particular,
WCN3680 supports 802.11ac, which is not available in WCN3660B.
This patch set introduces a new "qcom,wcn3660b" compatible to fix the msm8916-samsung-a5u device tree.
Stephan Gerhold (3):
dt-bindings: remoteproc: qcom,wcnss-pil: Add qcom,wcn3660b compatible
remoteproc: qcom_wcnss_iris: Add qcom,wcn3660b compatible
arm64: dts: qcom: msm8916-samsung-a5u: Fix iris compatible
Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt | 1 + arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 2 +- drivers/remoteproc/qcom_wcnss_iris.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
Signature · 1 line
2.30.0
PATCH 1/3 dt-bindings: remoteproc: qcom,wcnss-pil: Add qcom,wcn3660b compatible
WCN3660B is a variant of WCN3660, but with the same regulator requirements as WCN3620/WCN3680. Add a new qcom,wcn3660b compatible to describe it from device trees.
--- Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt +1 -0
@@ -80,6 +80,7 @@ and its resource dependencies. It is described by the following properties: Definition: must be one of: "qcom,wcn3620", "qcom,wcn3660", + "qcom,wcn3660b", "qcom,wcn3680" - clocks:
Signature · 1 line
2.30.0
Re: [PATCH 1/3] dt-bindings: remoteproc: qcom,wcnss-pil: Add qcom,wcn3660b compatible
Quoted 9 lines · Stephan Gerhold
WCN3660B is a variant of WCN3660, but with the same regulator requirements as WCN3620/WCN3680. Add a new qcom,wcn3660b compatible to describe it from device trees.
Signed-off-by Stephan Gerhold <[email protected]>--- Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt | 1 + 1 file changed, 1 insertion(+)
PATCH 2/3 remoteproc: qcom_wcnss_iris: Add qcom,wcn3660b compatible
In reply to Stephan GerholdWCN3660B is a variant of WCN3660, but with the same regulator requirements as WCN3620/WCN3680. As far as qcom_wcnss_iris is concerned we can just use qcom,wcn3680 (wcn3680_data).
However, a separate compatible is needed for WCN3660B because the wcn36xx driver uses it to enable chip-specific functionality. In particular, it enables 802.11ac for qcom,wcn3680 which is not supported by WCN3660B.
--- drivers/remoteproc/qcom_wcnss_iris.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_wcnss_iris.c +1 -0
@@ -160,6 +160,7 @@ static int qcom_iris_remove(struct platform_device *pdev)static const struct of_device_id iris_of_match[] = { { .compatible ="qcom,wcn3620" , .data = &wcn3620_data }, { .compatible ="qcom,wcn3660" , .data = &wcn3660_data }, + { .compatible ="qcom,wcn3660b" , .data = &wcn3680_data }, { .compatible ="qcom,wcn3680" , .data = &wcn3680_data }, {} };
Signature · 1 line
2.30.0
PATCH 3/3 arm64: dts: qcom: msm8916-samsung-a5u: Fix iris compatible
In reply to Stephan GerholdUnlike most MSM8916 boards, samsung-a5u uses WCN3660B instead of WCN3620 to support the 5 GHz band additionally.
WCN3660B has similar requirements as WCN3620, but it needs the XO clock to run at 48 MHz instead of 19.2 MHz. So far it was possible to describe that configuration using the qcom,wcn3680 compatible.
However, as of commit 8490987bdb9a ("wcn36xx: Hook and identify RF_IRIS_WCN3680"), the wcn36xx driver will now use the qcom,wcn3680 compatible
to enable functionality specific to WCN3680. In particular,
WCN3680 supports 802.11ac, which is not available in WCN3660B.
Use the new qcom,wcn3660b compatible to describe the chip properly.
--- arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts +1 -1
@@ -38,7 +38,7 @@ touchscreen@48 { &pronto { iris { - compatible = "qcom,wcn3680"; + compatible = "qcom,wcn3660b"; }; };
Signature · 1 line
2.30.0