Commit a25d2dbb authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20231213162856.188566-4-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 39859a12
......@@ -2256,8 +2256,6 @@ lpass_wsa2macro: codec@6aa0000 {
#clock-cells = <0>;
clock-output-names = "wsa2-mclk";
pinctrl-names = "default";
pinctrl-0 = <&wsa2_swr_active>;
#sound-dai-cells = <1>;
};
......@@ -2269,6 +2267,9 @@ swr3: soundwire@6ab0000 {
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 @@ lpass_rxmacro: codec@6ac0000 {
#clock-cells = <0>;
clock-output-names = "mclk";
pinctrl-names = "default";
pinctrl-0 = <&rx_swr_active>;
#sound-dai-cells = <1>;
};
......@@ -2315,6 +2314,9 @@ swr1: soundwire@6ad0000 {
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 @@ lpass_txmacro: codec@6ae0000 {
#clock-cells = <0>;
clock-output-names = "mclk";
pinctrl-names = "default";
pinctrl-0 = <&tx_swr_active>;
#sound-dai-cells = <1>;
};
......@@ -2367,8 +2367,6 @@ lpass_wsamacro: codec@6b00000 {
#clock-cells = <0>;
clock-output-names = "mclk";
pinctrl-names = "default";
pinctrl-0 = <&wsa_swr_active>;
#sound-dai-cells = <1>;
};
......@@ -2380,6 +2378,9 @@ swr0: soundwire@6b10000 {
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 @@ swr2: soundwire@6d30000 {
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>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment