From 3a2d80ecb74ee4cd02449873ece0407c7da0da4e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 6 Nov 2019 12:56:57 +0100 Subject: [PATCH] sof-hda-dsp: the JackHWMute definition should be in the Headphone device Signed-off-by: Jaroslav Kysela --- .../HiFi.conf | 6 ++++-- ucm/sof-hda-dsp/HiFi.conf | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf b/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf index 92c531f..ff86641 100644 --- a/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf +++ b/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf @@ -2,7 +2,7 @@ -SectionDevice."Bass Speaker" { +SectionDevice."BassSpeaker" { Comment "Bass Speaker" EnableSequence [ @@ -20,7 +20,9 @@ SectionDevice."Bass Speaker" { Value { PlaybackPCM "hw:sofhdadsp,0" - JackHWMute "Headphone" PlaybackChannels "2" } } + +# override JackHWMute +SectionDevice."Headphone".!JackHWMute "Speaker BassSpeaker" diff --git a/ucm/sof-hda-dsp/HiFi.conf b/ucm/sof-hda-dsp/HiFi.conf index 244bff6..f104354 100644 --- a/ucm/sof-hda-dsp/HiFi.conf +++ b/ucm/sof-hda-dsp/HiFi.conf @@ -34,6 +34,7 @@ SectionDevice."Headphone" { JackType "gpio" JackSwitch "12" JackControl "Headphone Jack" + JackHWMute "Speaker" } } @@ -54,7 +55,6 @@ SectionDevice."Speaker" { PlaybackPCM "hw:sofhdadsp,0" PlaybackVolume "name='Speaker'" PlaybackSwitch "name='Speaker Playback Switch'" - JackHWMute "Headphone" PlaybackChannels "2" } } -- 2.47.1