diff --git a/alsa-lib.spec b/alsa-lib.spec index 64da136..58ffd41 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -9,7 +9,7 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: %{version_alsa_lib} -Release: 1%{?prever_dot}%{?dist} +Release: 2%{?prever_dot}%{?dist} License: LGPLv2+ URL: http://www.alsa-project.org/ @@ -167,6 +167,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h %{_datadir}/alsa/topology %changelog +* Tue May 16 2023 Jaroslav Kysela - 1.2.9-2 +- update ucm (nhlt-dmic-info) + * Thu May 4 2023 Jaroslav Kysela - 1.2.9-1 - update to 1.2.9 diff --git a/alsa-ucm-conf.patch b/alsa-ucm-conf.patch index e69de29..836a828 100644 --- a/alsa-ucm-conf.patch +++ b/alsa-ucm-conf.patch @@ -0,0 +1,179 @@ +From 906f692e4ed84dc136c270c05e1b490a554de99b Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 4 May 2023 14:36:49 +0200 +Subject: [PATCH 1/3] sof-essx8336: Dmic is not a valid UCM device identifier, + use Mic + +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-essx8336/sof-essx8336.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ucm2/Intel/sof-essx8336/sof-essx8336.conf b/ucm2/Intel/sof-essx8336/sof-essx8336.conf +index f74e007..f579a45 100644 +--- a/ucm2/Intel/sof-essx8336/sof-essx8336.conf ++++ b/ucm2/Intel/sof-essx8336/sof-essx8336.conf +@@ -32,7 +32,7 @@ If.devdmic { + Haystack "${CardComponents}" + Needle "cfg-dmics:" + } +- True.Define.DeviceDmic "Dmic" ++ True.Define.DeviceDmic "Mic" + } + + SectionUseCase."HiFi" { +-- +2.39.2 + + +From 9fa70add76388087613d02b821acd656268060c4 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 16 May 2023 16:26:38 +0200 +Subject: [PATCH 2/3] sof-hda-dsp,sof-soundwire: add CaptureMicInfoFile fields + for dmics + +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/HiFi.conf | 1 + + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 3 +++ + ucm2/sof-soundwire/dmic.conf | 1 + + ucm2/sof-soundwire/rt715-sdca.conf | 11 ++++++----- + ucm2/sof-soundwire/rt715.conf | 1 + + ucm2/sof-soundwire/sof-soundwire.conf | 11 +++++++++++ + 6 files changed, 23 insertions(+), 5 deletions(-) + +diff --git a/ucm2/Intel/sof-hda-dsp/HiFi.conf b/ucm2/Intel/sof-hda-dsp/HiFi.conf +index 265949e..2063fc0 100644 +--- a/ucm2/Intel/sof-hda-dsp/HiFi.conf ++++ b/ucm2/Intel/sof-hda-dsp/HiFi.conf +@@ -22,6 +22,7 @@ If.dmic { + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},6" ++ CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" + If.chn { + Condition { + Type RegexMatch +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index e430a7b..44acd69 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -12,6 +12,7 @@ If.devdmic { + True { + Define.DeviceDmic "Mic1" + Define.DeviceMic "Mic2" ++ Include.card-init.File "/lib/card-init.conf" + FixedBootSequence [ + # + # users expect to turn the LED on when only internal +@@ -19,6 +20,8 @@ If.devdmic { + # when all internal inputs are off + # + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" ++ # dmic array info ++ exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json" + ] + } + } +diff --git a/ucm2/sof-soundwire/dmic.conf b/ucm2/sof-soundwire/dmic.conf +index 755840a..c53d381 100644 +--- a/ucm2/sof-soundwire/dmic.conf ++++ b/ucm2/sof-soundwire/dmic.conf +@@ -17,5 +17,6 @@ SectionDevice."Mic" { + CaptureMixerElem "Dmic0" + CaptureVolume "Dmic0 Capture Volume" + CaptureSwitch "Dmic0 Capture Switch" ++ CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" + } + } +diff --git a/ucm2/sof-soundwire/rt715-sdca.conf b/ucm2/sof-soundwire/rt715-sdca.conf +index 6e481e1..268a247 100644 +--- a/ucm2/sof-soundwire/rt715-sdca.conf ++++ b/ucm2/sof-soundwire/rt715-sdca.conf +@@ -12,10 +12,11 @@ SectionDevice."Mic" { + ] + + Value { +- CapturePriority 100 +- CapturePCM "hw:${CardId},4" +- CaptureSwitch "rt714 FU02 Capture Switch" +- CaptureVolume "rt714 FU02 Capture Volume" +- CaptureMixerElem "rt714 FU02" ++ CapturePriority 100 ++ CapturePCM "hw:${CardId},4" ++ CaptureSwitch "rt714 FU02 Capture Switch" ++ CaptureVolume "rt714 FU02 Capture Volume" ++ CaptureMixerElem "rt714 FU02" ++ CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" + } + } +diff --git a/ucm2/sof-soundwire/rt715.conf b/ucm2/sof-soundwire/rt715.conf +index a733c08..090b663 100644 +--- a/ucm2/sof-soundwire/rt715.conf ++++ b/ucm2/sof-soundwire/rt715.conf +@@ -26,5 +26,6 @@ SectionDevice."Mic" { + CaptureSwitch "${var:rt715ctl} Switch" + CaptureVolume "${var:rt715ctl} Volume" + CaptureMixerElem "${var:rt715ctl}" ++ CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" + } + } +diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf +index 786ba63..3368d65 100644 +--- a/ucm2/sof-soundwire/sof-soundwire.conf ++++ b/ucm2/sof-soundwire/sof-soundwire.conf +@@ -92,3 +92,14 @@ If.pga_init_pga5 { + cset "name='PGA5.0 5 Master Capture Switch' 1" + ] + } ++ ++If.mics-array { ++ Condition { ++ Type String ++ Empty "${var:Mics1}" ++ } ++ False.FixedBootSequence { ++ # dmic array info ++ exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json" ++ } ++} +-- +2.39.2 + + +From 5cdbc7e283cd80994f31f2e2a3f4df8af778ccb8 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 16 May 2023 17:39:00 +0200 +Subject: [PATCH 3/3] sof-hda-dsp: move card-init include to top + +... otherwise the rm is called after the nhlt-dmic-info + +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index 44acd69..98098e7 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -3,6 +3,8 @@ Syntax 6 + Define.DeviceMic "Mic" + Define.DeviceDmic "" + ++Include.card-init.File "/lib/card-init.conf" ++ + If.devdmic { + Condition { + Type String +@@ -12,7 +14,6 @@ If.devdmic { + True { + Define.DeviceDmic "Mic1" + Define.DeviceMic "Mic2" +- Include.card-init.File "/lib/card-init.conf" + FixedBootSequence [ + # + # users expect to turn the LED on when only internal +-- +2.39.2 +