arm64: dts: qcom: sm8650-qrd: add port mapping to speakers

Add appropriate mappings of Soundwire ports of WSA8845 speaker
to correctly map the Speaker ports to the WSA macro ports.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240627-topic-sm8650-upstream-was-port-mapping-v1-3-4700bcc2489a@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
index 6e3c4d8dcc19c38002ec8c1b27dc1e7c691742be..b0d7927b708f1d01877c9177da5e02180a333029 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
@@ -1089,6 +1089,16 @@
                sound-name-prefix = "SpkrLeft";
                vdd-1p8-supply = <&vreg_l15b_1p8>;
                vdd-io-supply = <&vreg_l3c_1p2>;
+
+               /*
+                * WSA8845 Port 1 (DAC)     <=> SWR0 Port 1 (SPKR_L)
+                * WSA8845 Port 2 (COMP)    <=> SWR0 Port 2 (SPKR_L_COMP)
+                * WSA8845 Port 3 (BOOST)   <=> SWR0 Port 3 (SPKR_L_BOOST)
+                * WSA8845 Port 4 (PBR)     <=> SWR0 Port 7 (PBR)
+                * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 10 (SPKR_L_VI)
+                * WSA8845 Port 6 (CPS)     <=> SWR0 Port 13 (CPS)
+                */
+               qcom,port-mapping = <1 2 3 7 10 13>;
        };
 
        /* WSA8845, Speaker Right */
@@ -1102,6 +1112,16 @@
                sound-name-prefix = "SpkrRight";
                vdd-1p8-supply = <&vreg_l15b_1p8>;
                vdd-io-supply = <&vreg_l3c_1p2>;
+
+               /*
+                * WSA8845 Port 1 (DAC)     <=> SWR0 Port 4 (SPKR_R)
+                * WSA8845 Port 2 (COMP)    <=> SWR0 Port 5 (SPKR_R_COMP)
+                * WSA8845 Port 3 (BOOST)   <=> SWR0 Port 6 (SPKR_R_BOOST)
+                * WSA8845 Port 4 (PBR)     <=> SWR0 Port 7 (PBR)
+                * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 11 (SPKR_R_VI)
+                * WSA8845 Port 6 (CPS)     <=> SWR0 Port 13 (CPS)
+                */
+               qcom,port-mapping = <4 5 6 7 11 13>;
        };
 };