* [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup
@ 2021-12-09 17:53 Srinivas Kandagatla
2021-12-09 17:53 ` [PATCH 1/2] arm64: dts: qcom: c630: Fix soundcard setup Srinivas Kandagatla
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Srinivas Kandagatla @ 2021-12-09 17:53 UTC (permalink / raw)
To: bjorn.andersson
Cc: agross, robh+dt, linux-arm-msm, devicetree, Srinivas Kandagatla
This patchset fixes issue a with existing sound card setup on c630 and
also adds Headset button threshold values for button detection.
relevant UCM changes are at
https://git.linaro.org/people/srinivas.kandagatla/alsa-ucm-conf.git/log/?h=v1.2.5/c630
Srinivas Kandagatla (2):
arm64: dts: qcom: c630: Fix soundcard setup
arm64: dts: qcom: c630: add headset jack and button detection support
.../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
--
2.21.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] arm64: dts: qcom: c630: Fix soundcard setup
2021-12-09 17:53 [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup Srinivas Kandagatla
@ 2021-12-09 17:53 ` Srinivas Kandagatla
2021-12-09 17:53 ` [PATCH 2/2] arm64: dts: qcom: c630: add headset jack and button detection support Srinivas Kandagatla
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Srinivas Kandagatla @ 2021-12-09 17:53 UTC (permalink / raw)
To: bjorn.andersson
Cc: agross, robh+dt, linux-arm-msm, devicetree, Srinivas Kandagatla
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 seperate 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>
---
.../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 d6b2ba4396f6..2e882a977e2c 100644
--- 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 {
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] arm64: dts: qcom: c630: add headset jack and button detection support
2021-12-09 17:53 [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup Srinivas Kandagatla
2021-12-09 17:53 ` [PATCH 1/2] arm64: dts: qcom: c630: Fix soundcard setup Srinivas Kandagatla
@ 2021-12-09 17:53 ` Srinivas Kandagatla
2021-12-09 18:19 ` [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup Steev Klimaszewski
2021-12-15 22:27 ` Bjorn Andersson
3 siblings, 0 replies; 5+ messages in thread
From: Srinivas Kandagatla @ 2021-12-09 17:53 UTC (permalink / raw)
To: bjorn.andersson
Cc: agross, robh+dt, linux-arm-msm, devicetree, Srinivas Kandagatla
Add MBHC support available in WCD934X codec.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 3 +++
1 file changed, 3 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 2e882a977e2c..58845a14805f 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -771,6 +771,9 @@
vdd-tx-supply = <&vreg_s4a_1p8>;
vdd-rx-supply = <&vreg_s4a_1p8>;
vdd-io-supply = <&vreg_s4a_1p8>;
+ qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>;
+ qcom,mbhc-headset-vthreshold-microvolt = <1700000>;
+ qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
swm: swm@c85 {
left_spkr: wsa8810-left{
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup
2021-12-09 17:53 [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup Srinivas Kandagatla
2021-12-09 17:53 ` [PATCH 1/2] arm64: dts: qcom: c630: Fix soundcard setup Srinivas Kandagatla
2021-12-09 17:53 ` [PATCH 2/2] arm64: dts: qcom: c630: add headset jack and button detection support Srinivas Kandagatla
@ 2021-12-09 18:19 ` Steev Klimaszewski
2021-12-15 22:27 ` Bjorn Andersson
3 siblings, 0 replies; 5+ messages in thread
From: Steev Klimaszewski @ 2021-12-09 18:19 UTC (permalink / raw)
To: Srinivas Kandagatla, bjorn.andersson
Cc: agross, robh+dt, linux-arm-msm, devicetree
On 12/9/21 11:53 AM, Srinivas Kandagatla wrote:
> This patchset fixes issue a with existing sound card setup on c630 and
> also adds Headset button threshold values for button detection.
>
> relevant UCM changes are at
> https://git.linaro.org/people/srinivas.kandagatla/alsa-ucm-conf.git/log/?h=v1.2.5/c630
>
> Srinivas Kandagatla (2):
> arm64: dts: qcom: c630: Fix soundcard setup
> arm64: dts: qcom: c630: add headset jack and button detection support
>
> .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 30 +++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
Tested on Lenovo Yoga C630
Tested-By: Steev Klimaszewski <steev@kali.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup
2021-12-09 17:53 [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup Srinivas Kandagatla
` (2 preceding siblings ...)
2021-12-09 18:19 ` [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup Steev Klimaszewski
@ 2021-12-15 22:27 ` Bjorn Andersson
3 siblings, 0 replies; 5+ messages in thread
From: Bjorn Andersson @ 2021-12-15 22:27 UTC (permalink / raw)
To: Srinivas Kandagatla; +Cc: linux-arm-msm, agross, robh+dt, devicetree
On Thu, 9 Dec 2021 17:53:40 +0000, Srinivas Kandagatla wrote:
> This patchset fixes issue a with existing sound card setup on c630 and
> also adds Headset button threshold values for button detection.
>
> relevant UCM changes are at
> https://git.linaro.org/people/srinivas.kandagatla/alsa-ucm-conf.git/log/?h=v1.2.5/c630
>
> Srinivas Kandagatla (2):
> arm64: dts: qcom: c630: Fix soundcard setup
> arm64: dts: qcom: c630: add headset jack and button detection support
>
> [...]
Applied, thanks!
[1/2] arm64: dts: qcom: c630: Fix soundcard setup
commit: c02b360ca67ebeb9de07b47b2fe53f964c2561d1
[2/2] arm64: dts: qcom: c630: add headset jack and button detection support
commit: ef10e1b89508d3315e47e23098fec60b33b1f6b3
Best regards,
--
Bjorn Andersson <bjorn.andersson@linaro.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-12-15 22:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-09 17:53 [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup Srinivas Kandagatla
2021-12-09 17:53 ` [PATCH 1/2] arm64: dts: qcom: c630: Fix soundcard setup Srinivas Kandagatla
2021-12-09 17:53 ` [PATCH 2/2] arm64: dts: qcom: c630: add headset jack and button detection support Srinivas Kandagatla
2021-12-09 18:19 ` [PATCH 0/2] arm64: dts: qcom: c630: update sound card setup Steev Klimaszewski
2021-12-15 22:27 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).