[PATCH 1/2] arm64: dts: msm8916-samsung-a2015: Enable WCNSS for WiFi and BT

[PATCH 1/2] arm64: dts: msm8916-samsung-a2015: Enable WCNSS for WiFi and BT

[Stephan Gerhold]

WCNSS is used on A3U and A5U for WiFi and BT,
and seems to work fine without further changes.

Enable it in the common include.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
 arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index e675ff48fdd2..6fc0b80d1f90 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -63,6 +63,10 @@
 			};
 		};
 
+		wcnss@a21b000 {
+			status = "okay";
+		};
+
 		/*
 		 * Attempting to enable these devices causes a "synchronous
 		 * external abort". Suspected cause is that the debug power
-- 
2.22.1

[PATCH 2/2] arm64: dts: msm8916-samsung-a5u: Override iris compatible

[Stephan Gerhold]

msm8916.dtsi sets the iris compatible to "qcom,wcn3620".
While WCN3620 seems to be used on most MSM8916 devices,
MSM8916 can also be paired with another chip (e.g. for WiFi dual-band).

A5U uses WCN3660B instead, so the compatible needs to be overridden
to apply the correct configuration.

However, simply using "qcom,wcn3660" would be incorrect,
since WCN3660B requires a slightly different regulator configuration
compared to WCN3660.

Instead, it requires the same configuration as "qcom,wcn3680".
Replace the compatible with "qcom,wcn3680" for A5U to make WCNSS
work correctly.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
I'm not quite sure if it would be better to define a new compatible
for WCN3660B (e.g. "qcom,wcn3660b") since this isn't really a WCN3680.
But in any case, it would use exactly the same configuration.

The compatible seems to be only used for regulator + clock configuration,
see https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/remoteproc/qcom_wcnss_iris.c#n57

 arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
index 1aa59da98495..6629a621139c 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
@@ -8,3 +8,9 @@
 	model = "Samsung Galaxy A5U (EUR)";
 	compatible = "samsung,a5u-eur", "qcom,msm8916";
 };
+
+&pronto {
+	iris {
+		compatible = "qcom,wcn3680";
+	};
+};
-- 
2.22.1