ucm2: treewide - JackHWMute fixes

Fixes: alsa-project#14 Signed-off-by: Jaroslav Kysela <perex@perex.cz>
thesofproject · Mar 1, 2020 · da45a07 · da45a07
1 parent 4622275
commit da45a07
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/ucm2/HDA-Intel/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf
@@ -93,6 +93,7 @@ SectionDevice."Mic2" {
 		CapturePriority 300
 		CapturePCM "hw:${CardId}"
 		JackHWMute "Line2"
+		JackControl "Mic Jack"
 	}
 
 	ConflictingDevice [

diff --git a/ucm2/broxton-rt298/HiFi.conf b/ucm2/broxton-rt298/HiFi.conf
@@ -30,7 +30,6 @@ SectionDevice."Speaker" {
 	Value {
 		PlaybackPriority 100
 		PlaybackPCM "hw:${CardId}"
-		JackHWMute "Headphones"
 	}
 }
 

diff --git a/ucm2/chtrt5645/HiFi-dmic2.conf b/ucm2/chtrt5645/HiFi-dmic2.conf
@@ -98,7 +98,7 @@ SectionDevice."Headset" {
 		CapturePriority 200
 		CapturePCM "hw:${CardId}"
 		JackControl "Headset Mic Jack"
-		JackHWMute "DMic"
+		JackHWMute "Mic"
 	}
 
 	EnableSequence [

diff --git a/ucm2/skylake-rt286/HiFi.conf b/ucm2/skylake-rt286/HiFi.conf
@@ -51,7 +51,6 @@ SectionDevice."Speaker" {
 	Value {
 		PlaybackPriority 100
 		PlaybackPCM "hw:${CardId}"
-		JackHWMute "Headphones"
 	}
 }
 

diff --git a/ucm2/sof-bdw-rt5677/HiFi.conf b/ucm2/sof-bdw-rt5677/HiFi.conf
@@ -132,7 +132,7 @@ SectionDevice."Headphones" {
 		PlaybackPriority 300
 		PlaybackPCM "hw:${CardId}"
 		JackControl "Headphone Jack"
-		JackHWMute "Speakers"
+		JackHWMute "Speaker"
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ SectionDevice."Speaker" { @@
     	Value {
     		PlaybackPriority 100
     		PlaybackPCM "hw:${CardId}"
-    		JackHWMute "Headphones"
     	}
     }
@@ Expand Down @@