arm64: dts: qcom: sm8250: Disable wsamacro and swr0 by default

They are not used on all boards, so disable them by default.
Enable them back on MTP/RB5, which were the only current users.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230124164616.228619-1-konrad.dybcio@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index 8c64cb060e21e200651d60d5ad90fb75cedc6b52..6802d36fb20ccc8780ab69f88414c3ac682038c0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -1007,6 +1007,8 @@
 };
 
 &swr0 {
+       status = "okay";
+
        left_spkr: speaker@0,3 {
                compatible = "sdw10217211000";
                reg = <0 3>;
@@ -1322,6 +1324,10 @@
        status = "okay";
 };
 
+&wsamacro {
+       status = "okay";
+};
+
 /* PINCTRL - additions to nodes defined in sm8250.dtsi */
 &qup_spi0_cs_gpio {
        drive-strength = <6>;

diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index 0991b34a8e49716f1dff6101278bb10f86d5a5de..c0d83fa9a73b3d7bbadf622c4dd527150cd6f910 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -759,6 +759,8 @@
 };
 
 &swr0 {
+       status = "okay";
+
        left_spkr: speaker@0,3 {
                compatible = "sdw10217211000";
                reg = <0 3>;
@@ -892,3 +894,7 @@
 &venus {
        status = "okay";
 };
+
+&wsamacro {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 64c08c399ab8cb42612ad58acf45aedb21a8335d..f69fa68a122222100247c78caceaf7a4ee4e4681 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2239,6 +2239,8 @@
 
                        pinctrl-names = "default";
                        pinctrl-0 = <&wsa_swr_active>;
+
+                       status = "disabled";
                };
 
                swr0: soundwire-controller@3250000 {
@@ -2259,6 +2261,8 @@
                        #sound-dai-cells = <1>;
                        #address-cells = <2>;
                        #size-cells = <0>;
+
+                       status = "disabled";
                };
 
                audiocc: clock-controller@3300000 {