OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology: merge sof-apl-dmic-2ch and sof-apl-dmic-4ch m4 files 

Use the same m4 files to generate both 2ch and 4ch topologies
by defining channels during compilation.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2019-03-14 12:13:24 -07:00 committed by Liam Girdwood
parent 17f85baa70
commit e5e5dcc806
3 changed files with 12 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/topology/CMakeLists.txt
View File

@ -33,8 +33,8 @@ set(TPLGS
"sof-icl-nocodec\;sof-icl-nocodec"
"sof-apl-eq-pcm512x\;sof-apl-eq-pcm512x"
"sof-apl-eq-dmic\;sof-apl-eq-dmic"
"sof-apl-dmic-2ch\;sof-apl-dmic-2ch"
"sof-apl-dmic-4ch\;sof-apl-dmic-4ch"
"sof-apl-dmic\;sof-apl-dmic-4ch\;-DCHANNELS=4"
"sof-apl-dmic\;sof-apl-dmic-2ch\;-DCHANNELS=2"
"sof-icl-dmic-4ch\;sof-icl-dmic-4ch"
"sof-apl-src-pcm512x\;sof-apl-src-pcm512x"
"sof-cml-rt5682\;sof-cml-rt5682\;-DPLATFORM=cml"

98
tools/topology/sof-apl-dmic-4ch.m4
View File

@ -1,98 +0,0 @@
#
# 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 <----- DMIC6 (DMIC01)
# PCM7 <----- DMIC7 (DMIC16k)
#
dnl PIPELINE_PCM_ADD(pipeline,
dnl pipe id, pcm, max channels, format,
dnl frames, deadline, priority, core)
# Passthrough capture pipeline 6 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,
6, 6, 4, s32le,
48, 1000, 0, 0)
# Passthrough capture pipeline 7 on PCM 7 using max 2 channels.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
7, 7, 4, s16le,
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,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 2, s32le,
48, 1000, 0, 0)
# capture DAI is DMIC 1 using 2 periods
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 2, s16le,
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_6)
PCM_CAPTURE_ADD(DMIC16k, 7, PIPELINE_PCM_7)
#
# 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, fifo word length, type, dai_index,
dnl 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)))
DAI_CONFIG(DMIC, 1, 7, NoCodec-7,
dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max,
dnl sample_rate, fifo word length, type, dai_index,
dnl pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000,
dnl DMIC_WORD_LENGTH(frame_format)
DMIC_WORD_LENGTH(s16le), DMIC, 1,
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, 1, FOUR_CH_PDM0_PDM1)))

17
tools/topology/sof-apl-dmic-2ch.m4 → tools/topology/sof-apl-dmic.m4
View File

@ -17,6 +17,9 @@ include(`sof/tokens.m4')
include(`platform/intel/bxt.m4')
include(`platform/intel/dmic.m4')
define(DMIC_PDM_CONFIG, ifelse(CHANNELS, `4', ``FOUR_CH_PDM0_PDM1'',
ifelse(CHANNELS, `2', ``STEREO_PDM0'', `')))
#
# Define the pipelines
#
@ -28,16 +31,16 @@ dnl PIPELINE_PCM_ADD(pipeline,
dnl pipe id, pcm, max channels, format,
dnl frames, deadline, priority, core)
# Passthrough capture pipeline 6 on PCM 6 using max 2 channels.
# Passthrough capture pipeline 6 on PCM 6 using max channels defined by CHANNELS.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
6, 6, 2, s32le,
6, 6, CHANNELS, s32le,
48, 1000, 0, 0)
# Passthrough capture pipeline 7 on PCM 7 using max 2 channels.
# Passthrough capture pipeline 7 on PCM 7 using max channels defined by CHANNELS.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
7, 7, 2, s16le,
7, 7, CHANNELS, s16le,
48, 1000, 0, 0)
#
@ -49,7 +52,6 @@ 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,
@ -64,6 +66,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
PIPELINE_SINK_7, 2, s16le,
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_6)
@ -84,7 +87,7 @@ DAI_CONFIG(DMIC, 0, 6, NoCodec-6,
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)))
PDM_CONFIG(DMIC, 0, DMIC_PDM_CONFIG)))
DAI_CONFIG(DMIC, 1, 7, NoCodec-7,
dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max,
@ -95,4 +98,4 @@ DAI_CONFIG(DMIC, 1, 7, NoCodec-7,
DMIC_WORD_LENGTH(s16le), DMIC, 1,
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, 1, STEREO_PDM0)))
PDM_CONFIG(DMIC, 1, DMIC_PDM_CONFIG)))