Takashi Iwai
f3bd61e636
- Backport upstream fixes: HDA SOF DSP support, Intel Atom profiles, etc 0004-hda-dsp-add-basic-ucm-config.patch 0005-update-README-files.patch 0006-bytcr-rt5651-Fix-dmic-check-in-HiFi-Components.conf.patch 0007-chtrt5645-Add-ASUSTeKCOMPUTERINC.-T100HAN-1.0-symlin.patch 0008-chtrt5645-Add-MEDION-E1239TMD60568-0.1-Wingman.conf-.patch 0009-chtrt5645-Remove-bogus-JackHWMute-settings.patch 0010-sof-hda-dsp-change-Headphones2-to-Mic2.patch OBS-URL: https://build.opensuse.org/request/show/796088 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=11
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 85ca26a4f2b73888dbce3437a402df13faf628fa Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Sun, 5 Apr 2020 20:34:50 +0200
|
|
Subject: [PATCH 06/10] bytcr-rt5651: Fix dmic check in HiFi-Components.conf
|
|
|
|
The kernel sets cfg-mic:dmic not cfg-mic:dmic1 when a digital mic is
|
|
used. The wrong check for cfg-mic:dmic1 causes there to be no "Mic"
|
|
device at all, which causes the check for the ConflictingDevices section
|
|
of the HeadSet (mic) device to fail like e.g. so:
|
|
|
|
[hans@localhost ~]$ alsaucm -c bytcr-rt5651 set _verb HiFi set _enadev Speaker
|
|
ALSA lib parser.c:1138:(verb_dev_list_add) error: unable to find device 'Mic'
|
|
ALSA lib parser.c:1433:(parse_verb_file) error: device management error in verb 'HiFi'
|
|
ALSA lib main.c:962:(snd_use_case_mgr_open) error: failed to import bytcr-rt5651 use case configuration -2
|
|
alsaucm: error failed to open sound card bytcr-rt5651: No such file or directory
|
|
|
|
This commit fixes this.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/bytcr-rt5651/HiFi-Components.conf | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ucm2/bytcr-rt5651/HiFi-Components.conf b/ucm2/bytcr-rt5651/HiFi-Components.conf
|
|
index 53ebcbe252c8..d0a573ef2cba 100644
|
|
--- a/ucm2/bytcr-rt5651/HiFi-Components.conf
|
|
+++ b/ucm2/bytcr-rt5651/HiFi-Components.conf
|
|
@@ -34,11 +34,11 @@ If.headphones {
|
|
}
|
|
}
|
|
|
|
-If.dmic1 {
|
|
+If.dmic {
|
|
Condition {
|
|
Type String
|
|
Haystack "${CardComponents}"
|
|
- Needle "cfg-mic:dmic1"
|
|
+ Needle "cfg-mic:dmic"
|
|
}
|
|
True {
|
|
<codecs/rt5651/DigitalMic.conf>
|
|
--
|
|
2.16.4
|
|
|