sof-hda-dsp,sof-soundwire: add CaptureMicInfoFile fields for dmics

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/Intel/sof-hda-dsp/HiFi.conf b/ucm2/Intel/sof-hda-dsp/HiFi.conf
index 265949eaa8f1795d1f5635203730fdfca01ea154..2063fc0d77aec4786d7f239a22ea7f75641fc043 100644 (file)
--- 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 e430a7b04b41999ad22ebbef07bcc2b4cc162294..44acd69e03a7bffbfcdace00225c7be5de538d6b 100644 (file)
--- 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 755840ab3a441b8a27602f8608fa135efbd34241..c53d381a5ec8c4530c5dc1975b970e381e3991d5 100644 (file)
--- 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 6e481e1a4734f7cde1bf40a93f93fe52c0bbfeab..268a247f113cf2bd3cbf55523b0f23569a8bc103 100644 (file)
--- 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 a733c08ad1a52050aaaf3f27722507d30b17a028..090b6630488d6cef6867e0004f932e95f17e0dc8 100644 (file)
--- 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 786ba63a0922bebfe678f4085269f25210103cd6..3368d656ef430a69ae9cdc49be225d021eb155cf 100644 (file)
--- 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"
+       }
+}