arm64: dts: qcom: c630: Fix soundcard setup

Currently Soundcard has 1 rx device for headset and SoundWire Speaker Playback.

This setup has issues, ex if we try to play on headset the audio stream is
also sent to SoundWire Speakers and we will hear sound in both headsets and speakers.

Make a separate device for Speakers and Headset so that the streams are
different and handled properly.

Fixes: 45021d35fcb2 ("arm64: dts: qcom: c630: Enable audio support")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: Steev Klimaszewski <steev@kali.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211209175342.20386-2-srinivas.kandagatla@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index d6b2ba4396f687f081cced74194513733eed4f03..2e882a977e2c49d9e054f11f9412f0d020f4daee 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -523,6 +523,10 @@
        dai@1 {
                reg = <1>;
        };
+
+       dai@2 {
+               reg = <2>;
+       };
 };
 
 &sound {
@@ -535,6 +539,7 @@
                "SpkrLeft IN", "SPK1 OUT",
                "SpkrRight IN", "SPK2 OUT",
                "MM_DL1",  "MultiMedia1 Playback",
+               "MM_DL3",  "MultiMedia3 Playback",
                "MultiMedia2 Capture", "MM_UL2";
 
        mm1-dai-link {
@@ -551,6 +556,13 @@
                };
        };
 
+       mm3-dai-link {
+               link-name = "MultiMedia3";
+               cpu {
+                       sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA3>;
+               };
+       };
+
        slim-dai-link {
                link-name = "SLIM Playback";
                cpu {
@@ -580,6 +592,21 @@
                        sound-dai = <&wcd9340 1>;
                };
        };
+
+       slim-wcd-dai-link {
+               link-name = "SLIM WCD Playback";
+               cpu {
+                       sound-dai = <&q6afedai SLIMBUS_1_RX>;
+               };
+
+               platform {
+                       sound-dai = <&q6routing>;
+               };
+
+               codec {
+                       sound-dai =  <&wcd9340 2>;
+               };
+       };
 };
 
 &tlmm {