From 8d4b10c5399eb55b74f3af2d48eafae7311b0bd9 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Tue, 23 Oct 2018 11:27:25 +0300 Subject: [PATCH] Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo --- topology/Makefile.am | 9 ++++- topology/sof-apl-dmic-2ch.m4 | 75 ++++++++++++++++++++++++++++++++++++ topology/sof-apl-dmic-4ch.m4 | 75 ++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 topology/sof-apl-dmic-2ch.m4 create mode 100644 topology/sof-apl-dmic-4ch.m4 diff --git a/topology/Makefile.am b/topology/Makefile.am index 3598055..d6809f1 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -40,7 +40,10 @@ MACHINES = \ sof-glk-da7219.tplg \ sof-icl-nocodec.tplg \ sof-apl-eq-pcm512x.tplg \ - sof-apl-eq-dmic.tplg + sof-apl-eq-dmic.tplg \ + sof-apl-dmic-2ch.tplg \ + sof-apl-dmic-4ch.tplg + # Uncomment the following line if you want to debug conf files .PRECIOUS: %.conf @@ -81,4 +84,6 @@ EXTRA_DIST = \ sof-glk-da7219.m4 \ sof-icl-nocodec.m4 \ sof-apl-eq-pcm512x.m4 \ - sof-apl-eq-dmic.m4 + sof-apl-eq-dmic.m4 \ + sof-apl-dmic-4ch.m4 \ + sof-apl-dmic-2ch.m4 diff --git a/topology/sof-apl-dmic-2ch.m4 b/topology/sof-apl-dmic-2ch.m4 new file mode 100644 index 0000000..0a8091b --- /dev/null +++ b/topology/sof-apl-dmic-2ch.m4 @@ -0,0 +1,75 @@ +# +# Topology for Apollo Lake with direct attach digital microphones array +# + +# Include topology builder +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') + +# Include TLV library +include(`common/tlv.m4') + +# Include Token library +include(`sof/tokens.m4') + +# Include Apollolake DSP configuration +include(`platform/intel/bxt.m4') +include(`platform/intel/dmic.m4') + +# +# Define the pipelines +# +# PCM6 <---- volume <----- DMIC6 (DMIC01) +# + +dnl PIPELINE_PCM_ADD(pipeline, +dnl pipe id, pcm, max channels, format, +dnl frames, deadline, priority, core) + + +# Passthrough capture pipeline 1 on PCM 6 using max 2 channels. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, + 1, 6, 2, s32le, + 48, 1000, 0, 0) + +# +# DAIs configuration +# + +dnl DAI_ADD(pipeline, +dnl pipe id, dai type, dai_index, dai_be, +dnl buffer, periods, format, +dnl frames, deadline, priority, core) + + +# capture DAI is DMIC 0 using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-capture.m4, + 1, DMIC, 0, NoCodec-6, + PIPELINE_SINK_1, 2, s32le, + 48, 1000, 0, 0) + +dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) + +dnl PCM_CAPTURE_ADD(name, pipeline, capture) +PCM_CAPTURE_ADD(DMIC01, 6, PIPELINE_PCM_1) + +# +# BE configurations - overrides config in ACPI if present +# + +dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) + +DAI_CONFIG(DMIC, 0, 6, NoCodec-6, + dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max, + dnl sample_rate, + dnl fifo word length, type, dai_index, pdm controller config) + DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000, + dnl DMIC_WORD_LENGTH(frame_format) + DMIC_WORD_LENGTH(s32le), DMIC, 0, + dnl PDM_CONFIG(type, dai_index, num pdm active, pdm tuples list) + dnl STEREO_PDM0 is a pre-defined pdm config for stereo capture + PDM_CONFIG(DMIC, 0, STEREO_PDM0))) + diff --git a/topology/sof-apl-dmic-4ch.m4 b/topology/sof-apl-dmic-4ch.m4 new file mode 100644 index 0000000..74cbdb9 --- /dev/null +++ b/topology/sof-apl-dmic-4ch.m4 @@ -0,0 +1,75 @@ +# +# Topology for Apollo Lake with direct attach digital microphones array +# + +# Include topology builder +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') + +# Include TLV library +include(`common/tlv.m4') + +# Include Token library +include(`sof/tokens.m4') + +# Include Apollolake DSP configuration +include(`platform/intel/bxt.m4') +include(`platform/intel/dmic.m4') + +# +# Define the pipelines +# +# PCM6 <---- volume <----- DMIC6 (DMIC01) +# + +dnl PIPELINE_PCM_ADD(pipeline, +dnl pipe id, pcm, max channels, format, +dnl frames, deadline, priority, core) + + +# Passthrough capture pipeline 1 on PCM 6 using max 4 channels. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, + 1, 6, 4, s32le, + 48, 1000, 0, 0) + +# +# DAIs configuration +# + +dnl DAI_ADD(pipeline, +dnl pipe id, dai type, dai_index, dai_be, +dnl buffer, periods, format, +dnl frames, deadline, priority, core) + + +# capture DAI is DMIC 0 using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-capture.m4, + 1, DMIC, 0, NoCodec-6, + PIPELINE_SINK_1, 2, s32le, + 48, 1000, 0, 0) + +dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) + +dnl PCM_CAPTURE_ADD(name, pipeline, capture) +PCM_CAPTURE_ADD(DMIC01, 6, PIPELINE_PCM_1) + +# +# BE configurations - overrides config in ACPI if present +# + +dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) + +DAI_CONFIG(DMIC, 0, 6, NoCodec-6, + dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max, + dnl sample_rate, + dnl fifo word length, type, dai_index, pdm controller config) + DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000, + dnl DMIC_WORD_LENGTH(frame_format) + DMIC_WORD_LENGTH(s32le), DMIC, 0, + dnl PDM_CONFIG(type, dai_index, num pdm active, pdm tuples list) + dnl STEREO_PDM0 is a pre-defined pdm config for stereo capture + PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1))) +