[1/5] bytcr-rt5651: Fix dmic check in HiFi-Components.conf
diff mbox series

Message ID 20200405183454.34515-1-hdegoede@redhat.com
State New
Headers show
Series
  • [1/5] bytcr-rt5651: Fix dmic check in HiFi-Components.conf
Related show

Commit Message

Hans de Goede April 5, 2020, 6:34 p.m. UTC
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>
---
 ucm2/bytcr-rt5651/HiFi-Components.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jaroslav Kysela April 6, 2020, 7:39 a.m. UTC | #1
Dne 05. 04. 20 v 20:34 Hans de Goede napsal(a):
> 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>
> ---
>   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 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>
> 

Applied. Thanks.

					Jaroslav

Patch
diff mbox series

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>