Takashi Iwai
ce841e36df
- Backport upstream fixes: fixes / corrections for sof-hda-dsp, es8316, chtrt5645 and broadwell-rt286: 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 OBS-URL: https://build.opensuse.org/request/show/766323 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=5
76 lines
1.7 KiB
Diff
76 lines
1.7 KiB
Diff
From adeb572487081f4f88318583d6eefb0ea1b61361 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 6 Dec 2019 11:12:39 +0100
|
|
Subject: [PATCH 2/6] sof-hda-dsp: Use more strict names according latest
|
|
use-case.h
|
|
|
|
Also remove ConflictinDevice section from the digital microphone.
|
|
Those paths are independent.
|
|
|
|
BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/7
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/sof-hda-dsp/HiFi.conf | 15 ++++++---------
|
|
1 file changed, 6 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf
|
|
index 500cbae82a43..5c7236d7bd02 100644
|
|
--- a/ucm2/sof-hda-dsp/HiFi.conf
|
|
+++ b/ucm2/sof-hda-dsp/HiFi.conf
|
|
@@ -6,7 +6,7 @@ SectionVerb {
|
|
]
|
|
}
|
|
|
|
-SectionDevice."Headphones" {
|
|
+SectionDevice."Headphones1" {
|
|
Comment "Headphones"
|
|
|
|
EnableSequence [
|
|
@@ -87,8 +87,9 @@ If.monomic {
|
|
Control "name='Input Source'"
|
|
ControlEnum "Headphone Mic"
|
|
}
|
|
+ After.SectionDevice "Mic"
|
|
True {
|
|
- SectionDevice."HeadphonesMic" {
|
|
+ SectionDevice."Headphones2" {
|
|
Comment "Headphones Stereo Microphone"
|
|
|
|
ConflictingDevice [
|
|
@@ -106,7 +107,7 @@ If.monomic {
|
|
}
|
|
}
|
|
|
|
- SectionDevice."HeadsetMic" {
|
|
+ SectionDevice."Headset" {
|
|
Comment "Headset Mono Microphone"
|
|
|
|
EnableSequence [
|
|
@@ -121,7 +122,7 @@ If.monomic {
|
|
}
|
|
}
|
|
False {
|
|
- SectionDevice."HeadphonesMic" {
|
|
+ SectionDevice."Headphones2" {
|
|
Comment "Headphones Stereo Microphone"
|
|
|
|
Value {
|
|
@@ -133,13 +134,9 @@ If.monomic {
|
|
}
|
|
}
|
|
|
|
-SectionDevice."DigitalMic" {
|
|
+SectionDevice."Mic" {
|
|
Comment "Digital Microphone"
|
|
|
|
- ConflictingDevice [
|
|
- "HeadsetMic"
|
|
- ]
|
|
-
|
|
Value {
|
|
CapturePriority 100
|
|
CapturePCM "hw:${CardId},6"
|
|
--
|
|
2.16.4
|
|
|