lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 167/563] arm64: dts: qcom: c630: Fix soundcard setup
    Date
    From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

    [ Upstream commit c02b360ca67ebeb9de07b47b2fe53f964c2561d1 ]

    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
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 27 +++++++++++++++++++
    1 file changed, 27 insertions(+)

    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 ad6561843ba28..e080c317b5e3d 100644
    --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
    +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
    @@ -365,6 +365,10 @@
    dai@1 {
    reg = <1>;
    };
    +
    + dai@2 {
    + reg = <2>;
    + };
    };

    &sound {
    @@ -377,6 +381,7 @@
    "SpkrLeft IN", "SPK1 OUT",
    "SpkrRight IN", "SPK2 OUT",
    "MM_DL1", "MultiMedia1 Playback",
    + "MM_DL3", "MultiMedia3 Playback",
    "MultiMedia2 Capture", "MM_UL2";

    mm1-dai-link {
    @@ -393,6 +398,13 @@
    };
    };

    + mm3-dai-link {
    + link-name = "MultiMedia3";
    + cpu {
    + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>;
    + };
    + };
    +
    slim-dai-link {
    link-name = "SLIM Playback";
    cpu {
    @@ -422,6 +434,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 {
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 04:09    [W:2.140 / U:1.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site