File 0002-ucm2-treewide-JackHWMute-fixes.patch of Package alsa-ucm-conf

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-ucm2-treewide-JackHWMute-fixes.patch of Package alsa-ucm-conf (Revision 63aaba549ba9ba2180b102540b9d2816)

Currently displaying revision 63aaba549ba9ba2180b102540b9d2816 , Show latest

From da45a07c756308b57facf1a97c4842274ff04fe3 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 1 Mar 2020 16:12:28 +0100
Subject: [PATCH 2/3] ucm2: treewide - JackHWMute fixes

Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/14

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 ucm2/HDA-Intel/HiFi-dual.conf  | 1 +
 ucm2/broxton-rt298/HiFi.conf   | 1 -
 ucm2/chtrt5645/HiFi-dmic2.conf | 2 +-
 ucm2/skylake-rt286/HiFi.conf   | 1 -
 ucm2/sof-bdw-rt5677/HiFi.conf  | 2 +-
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ucm2/HDA-Intel/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf
index 174fef4787b1..277894ada2f7 100644
--- 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 6f5b9a594f65..f7e561f9c4eb 100644
--- 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 c9fdd79e4cd0..d3f880aa6bc0 100644
--- 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 9e94a1b1072d..ed4bfa73c095 100644
--- 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 f4b144996d37..724a1cc3fbdf 100644
--- 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"
 	}
 }
 
-- 
2.16.4

Places

File 0002-ucm2-treewide-JackHWMute-fixes.patch of Package alsa-ucm-conf (Revision 63aaba549ba9ba2180b102540b9d2816)

Places