From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 6 Nov 2019 11:56:57 +0000 (+0100)
Subject: sof-hda-dsp: the JackHWMute definition should be in the Headphone device
X-Git-Tag: v1.2.1~18
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=3a2d80ecb74ee4cd02449873ece0407c7da0da4e;p=alsa-ucm-conf.git

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 92c531f..ff86641 100644
--- 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 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"
 	}
 }