sof-hda-dsp: the JackHWMute definition should be in the Headphone device

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf b/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf
index 92c531f625ba66cfeb388129c64ed3dc141f008b..ff86641a3072565215f2a1b637917028722f9b89 100644 (file)
--- a/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf
+++ b/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf
@@ -2,7 +2,7 @@
 
 <sof-hda-dsp/HiFi.conf>
 
-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 244bff6bfc65c547f34bad07c7bd29e63b19d8d2..f1043544ca0731a61e802a5a32b0817e6e7e393a 100644 (file)
--- 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"
        }
 }