arm64: dts: qcom: sm8550: move Soundwire pinctrl to its nodes

Pin configuration for Soundwire bus should be set in Soundwire
controller nodes, not in the associated macro codec node.  This
placement change should not have big impact in general, because macro
codec is a clock provider for Soundwire controller, thus its devices is
probed first.  However it will have impact for disabled Soundwire buses,
e.g. WSA2, because after this change the pins will be left in default
state.

We also follow similar approach in newer SoCs, like Qualcomm SM8650.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20231213162856.188566-4-krzysztof.kozlowski@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index 735ffd926777401c8c86c3b9f8623c04851af7bc..661385ccc436fc62c471084cb66d03b6f49f91d6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -2256,8 +2256,6 @@
 
                        #clock-cells = <0>;
                        clock-output-names = "wsa2-mclk";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&wsa2_swr_active>;
                        #sound-dai-cells = <1>;
                };
 
@@ -2269,6 +2267,9 @@
                        clock-names = "iface";
                        label = "WSA2";
 
+                       pinctrl-0 = <&wsa2_swr_active>;
+                       pinctrl-names = "default";
+
                        qcom,din-ports = <4>;
                        qcom,dout-ports = <9>;
 
@@ -2302,8 +2303,6 @@
 
                        #clock-cells = <0>;
                        clock-output-names = "mclk";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&rx_swr_active>;
                        #sound-dai-cells = <1>;
                };
 
@@ -2315,6 +2314,9 @@
                        clock-names = "iface";
                        label = "RX";
 
+                       pinctrl-0 = <&rx_swr_active>;
+                       pinctrl-names = "default";
+
                        qcom,din-ports = <1>;
                        qcom,dout-ports = <11>;
 
@@ -2348,8 +2350,6 @@
 
                        #clock-cells = <0>;
                        clock-output-names = "mclk";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&tx_swr_active>;
                        #sound-dai-cells = <1>;
                };
 
@@ -2367,8 +2367,6 @@
 
                        #clock-cells = <0>;
                        clock-output-names = "mclk";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&wsa_swr_active>;
                        #sound-dai-cells = <1>;
                };
 
@@ -2380,6 +2378,9 @@
                        clock-names = "iface";
                        label = "WSA";
 
+                       pinctrl-0 = <&wsa_swr_active>;
+                       pinctrl-names = "default";
+
                        qcom,din-ports = <4>;
                        qcom,dout-ports = <9>;
 
@@ -2409,6 +2410,9 @@
                        clock-names = "iface";
                        label = "TX";
 
+                       pinctrl-0 = <&tx_swr_active>;
+                       pinctrl-names = "default";
+
                        qcom,din-ports = <4>;
                        qcom,dout-ports = <0>;
                        qcom,ports-sinterval-low =      /bits/ 8 <0x01 0x01 0x03 0x03>;