From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 5 Apr 2020 18:34:50 +0000 (+0200)
Subject: bytcr-rt5651: Fix dmic check in HiFi-Components.conf
X-Git-Tag: v1.2.3~31
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=85ca26a4f2b73888dbce3437a402df13faf628fa;p=alsa-ucm-conf.git

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>
---

diff --git a/ucm2/bytcr-rt5651/HiFi-Components.conf b/ucm2/bytcr-rt5651/HiFi-Components.conf
index 53ebcbe..d0a573e 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>