Takashi Iwai
0658f0347a
- Update to alsa-ucm-conf 1.2.2: including previous fixes - Backport recent upstream fixes: SOF, BDW-rt5677 and jack fixes; 0001-sof-bdw-rt5677-initial-port-to-UCM2.patch 0002-ucm2-treewide-JackHWMute-fixes.patch 0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch - Drop obsoleted patches: 0001-sof-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch 0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch 0003-README-remove-topologies-note.patch 0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch 0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch 0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch 0007-broxton-rt298-corrections-cleanups.patch 0008-bytcr-rt5640-cleanups-and-corrections.patch 0009-bytcr-rt5651-cleanups-and-corrections.patch 0010-bytcht-cx2072x-cleanups-and-corrections.patch 0011-bytcht-es8316-cleanups-and-corrections.patch 0012-DAISY-I2S-added-back-PCM-devices.patch 0013-DB410c-cleanups-and-corrections.patch 0014-DB820c-cleanups-and-corrections.patch 0015-Dell-WD15-Dock-cleaups-and-corrections.patch 0016-HDA-Intel-HiFi-dual-fixes-and-corrections.patch 0017-cht-bsw-rt5672-fixes-and-corrections.patch 0018-chtnau8824-fixes-and-corrections.patch 0019-skylake-rt286-fixes-and-corrections.patch 0020-SDP4430-corrections-and-fixes.patch 0021-sof-hda-dsp-fix-typo-PlaybackMixerMaster-PlaybackMas.patch 0022-broadwell-rt286-add-correct-prefix-to-Priority-field.patch 0023-GoogleNyan-comment-CaptureControl-what-is-this.patch OBS-URL: https://build.opensuse.org/request/show/784660 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=9
82 lines
2.3 KiB
Diff
82 lines
2.3 KiB
Diff
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
|
|
|