ucm2: treewide - JackHWMute fixes

Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/14
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/HDA-Intel/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf
index 174fef4787b198ab83482b361c921bd2568069ca..277894ada2f7d62360f0841e2a3a8313d9d933b6 100644 (file)
--- 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
index 6f5b9a594f652dfd22f30242b49c806aa12877f0..f7e561f9c4ebb0fc59a99534b1840c0c64868ecc 100644 (file)
--- 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
index c9fdd79e4cd09a03342c7676bb4f8d8402e65d42..d3f880aa6bc0845187e4e58e82c25495a7322339 100644 (file)
--- 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
index 9e94a1b1072d8490ed011dba618ae435aad44e94..ed4bfa73c09576e11aa78d92ef10923bc43c4136 100644 (file)
--- 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
index f4b144996d370e068f1f2e31987a7ac5590bed06..724a1cc3fbdfb245ad3a3d35d79522b5f5b10d52 100644 (file)
--- 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"
        }
 }