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

topology: apl: share asymmetrical dmic pipe setting 

apl dmic asymmetrical topologies are shared most of common codes. Share
one m4 macro for all.

Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
This commit is contained in:
Fred Oh 2020-03-31 16:57:43 -07:00 committed by Liam Girdwood
parent 99d03de968
commit 8d03efe701
9 changed files with 86 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/topology/CMakeLists.txt
View File

@ -80,11 +80,9 @@ set(TPLGS
"sof-apl-pcm512x-nohdmi\;sof-apl-eq-pcm512x\;-DPPROC=eq-volume"
"sof-apl-dmic\;sof-apl-eq-dmic\;-DCHANNELS=4\;-DCPROC=eq"
"sof-apl-src-dmic\;sof-apl-src-dmic"
"sof-apl-dmic-a2ch\;sof-apl-dmic-a2ch"
"sof-apl-dmic-b2ch\;sof-apl-dmic-b2ch"
"sof-apl-dmic-a2ch-b2ch\;sof-apl-dmic-a2ch-b2ch"
"sof-apl-dmic-a4ch-b2ch\;sof-apl-dmic-a4ch-b2ch"
"sof-apl-dmic-a2ch-b4ch\;sof-apl-dmic-a2ch-b4ch"
"sof-apl-dmic-asymmetric\;sof-apl-dmic-a2ch-b4ch\;-DDMICSETTING=apl-dmic-a2b4"
"sof-apl-dmic-asymmetric\;sof-apl-dmic-a2ch-b2ch\;-DDMICSETTING=apl-dmic-a2b2"
"sof-apl-dmic-asymmetric\;sof-apl-dmic-a4ch-b2ch\;-DDMICSETTING=apl-dmic-a4b2"
"sof-apl-dmic-a96k-b16k\;sof-apl-dmic-a96k-b16k"
"sof-apl-dmic\;sof-apl-dmic-4ch\;-DCHANNELS=4\;-DCPROC=volume"
"sof-apl-dmic\;sof-apl-dmic-2ch\;-DCHANNELS=2\;-DCPROC=volume"

20
tools/topology/platform/intel/apl-dmic-a2b2.m4 Normal file
View File

@ -0,0 +1,20 @@
# apl dmic settings for A2-B2
undefine(`ACHANNEL')
undefine(`AFORMAT')
undefine(`ARATE')
undefine(`APDM')
undefine(`BCHANNEL')
undefine(`BFORMAT')
undefine(`BRATE')
undefine(`BPDM')
define(`ACHANNEL', `2')
define(`AFORMAT', `s32le')
define(`ARATE', `48000')
define(`APDM', `STEREO_PDM0')
define(`BCHANNEL', `2')
define(`BFORMAT', `s32le')
define(`BRATE', `16000')
define(`BPDM', `STEREO_PDM1')

20
tools/topology/platform/intel/apl-dmic-a2b4.m4 Normal file
View File

@ -0,0 +1,20 @@
# apl dmic settings for A2-B4
undefine(`ACHANNEL')
undefine(`AFORMAT')
undefine(`ARATE')
undefine(`APDM')
undefine(`BCHANNEL')
undefine(`BFORMAT')
undefine(`BRATE')
undefine(`BPDM')
define(`ACHANNEL', `2')
define(`AFORMAT', `s16le')
define(`ARATE', `48000')
define(`APDM', `STEREO_PDM0')
define(`BCHANNEL', `4')
define(`BFORMAT', `s32le')
define(`BRATE', `16000')
define(`BPDM', `FOUR_CH_PDM0_PDM1')

20
tools/topology/platform/intel/apl-dmic-a4b2.m4 Normal file
View File

@ -0,0 +1,20 @@
# apl dmic settings for A4-B2
undefine(`ACHANNEL')
undefine(`AFORMAT')
undefine(`ARATE')
undefine(`APDM')
undefine(`BCHANNEL')
undefine(`BFORMAT')
undefine(`BRATE')
undefine(`BPDM')
define(`ACHANNEL', `4')
define(`AFORMAT', `s16le')
define(`ARATE', `48000')
define(`APDM', `FOUR_CH_PDM0_PDM1')
define(`BCHANNEL', `2')
define(`BFORMAT', `s16le')
define(`BRATE', `16000')
define(`BPDM', `STEREO_PDM0')

100
tools/topology/sof-apl-dmic-a2ch-b2ch.m4
View File

@ -1,100 +0,0 @@
#
# Topology for Apollo Lake with direct attach digital microphones array
#
# Capture configuration
# DAI0 2ch 32b mic1-2
# DAI1 2ch 32b mic3-4
# 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 period, priority, core,
dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)
# Passthrough capture pipeline 6 on PCM 6 using max channels 2.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
6, 6, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
# Passthrough capture pipeline 7 on PCM 7 using max channels 2.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture-16khz.m4,
7, 7, 2, s32le,
1000, 0, 0,
16000, 16000, 16000)
#
# DAIs configuration
#
dnl DAI_ADD(pipeline,
dnl pipe id, dai type, dai_index, dai_be,
dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)
# capture DAI is DMIC 0 using 2 periods
# Buffers use s32le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 2, s32le,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
# capture DAI is DMIC 1 using 2 periods
# Buffers use s32le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 2, s32le,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
dnl PCM_CAPTURE_ADD(name, pipeline, capture)
PCM_CAPTURE_ADD(DMIC, 6, PIPELINE_PCM_6)
PCM_CAPTURE_ADD(DMIC16kHz, 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, unmute time, type,
dnl dai_index, pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
DMIC_WORD_LENGTH(s32le), 400, DMIC, 0,
PDM_CONFIG(DMIC, 0, STEREO_PDM0)))
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, unmute time, type,
dnl dai_index, pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000,
DMIC_WORD_LENGTH(s32le), 400, DMIC, 1,
PDM_CONFIG(DMIC, 1, STEREO_PDM1)))

76
tools/topology/sof-apl-dmic-a2ch.m4
View File

@ -1,76 +0,0 @@
#
# Topology for Apollo Lake with direct attach digital microphones array
#
# Capture configuration
# DAI0 2ch 32b mic1-2
# DAI1 none
# 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)
#
dnl PIPELINE_PCM_ADD(pipeline,
dnl pipe id, pcm, max channels, format,
dnl period, priority, core,
dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)
# Passthrough capture pipeline 6 on PCM 6 using max channels 2.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
6, 6, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
#
# DAIs configuration
#
dnl DAI_ADD(pipeline,
dnl pipe id, dai type, dai_index, dai_be,
dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)
# capture DAI is DMIC 0 using 2 periods
# Buffers use s32le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 2, s32le,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
dnl PCM_CAPTURE_ADD(name, pipeline, capture)
PCM_CAPTURE_ADD(DMIC, 6, PIPELINE_PCM_6)
#
# 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, unmute time, type,
dnl dai_index, pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
DMIC_WORD_LENGTH(s32le), 400, DMIC, 0,
PDM_CONFIG(DMIC, 0, STEREO_PDM0)))

99
tools/topology/sof-apl-dmic-a4ch-b2ch.m4
View File

@ -1,99 +0,0 @@
#
# Topology for Apollo Lake with direct attach digital microphones array
#
# Capture configuration
# DAI0 4ch 16b mic1-2
# DAI1 2ch 16b mic1-4
# 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 period, priority, core,
dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)
# Passthrough capture pipeline 6 on PCM 6 using max channels 4.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
6, 6, 4, s16le,
1000, 0, 0, DMIC,
48000, 48000, 48000)
# Passthrough capture pipeline 7 on PCM 7 using max channels 2.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture-16khz.m4,
7, 7, 2, s16le,
1000, 0, 0, DMIC,
16000, 16000, 16000)
#
# DAIs configuration
#
dnl DAI_ADD(pipeline,
dnl pipe id, dai type, dai_index, dai_be,
dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)
# capture DAI is DMIC 0 using 2 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 2, s16le,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
# capture DAI is DMIC 1 using 2 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 2, s16le,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
dnl PCM_CAPTURE_ADD(name, pipeline, capture)
PCM_CAPTURE_ADD(DMIC, 6, PIPELINE_PCM_6)
PCM_CAPTURE_ADD(DMIC16kHz, 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, unmute time, type,
dnl dai_index, pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
DMIC_WORD_LENGTH(s16le), 400, DMIC, 0,
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, unmute time, type,
dnl dai_index, pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000,
DMIC_WORD_LENGTH(s16le), 400, DMIC, 1,
PDM_CONFIG(DMIC, 1, STEREO_PDM0)))

43
tools/topology/sof-apl-dmic-a2ch-b4ch.m4 → tools/topology/sof-apl-dmic-asymmetric.m4
View File

@ -2,9 +2,11 @@
# Topology for Apollo Lake with direct attach digital microphones array
#
ifdef(`DMICSETTING', , `apl-dmic-a2b4')
include(`platform/intel/'DMICSETTING`.m4')
# Capture configuration
# DAI0 2ch 16b mic1-2
# DAI1 4ch 32b mic1-4
`# DAI0 'ACHANNEL`ch 'AFORMAT` mic1-2'
`# DAI1 'BCHANNEL`ch 'BFORMAT` mic1-4'
# Include topology builder
include(`utils.m4')
@ -21,11 +23,12 @@ include(`sof/tokens.m4')
include(`platform/intel/bxt.m4')
include(`platform/intel/dmic.m4')
#
# Define the pipelines
#
# PCM6 <----- DMIC6 (DMIC01)
# PCM7 <----- DMIC7 (DMIC16k)
# PCM6 <--- volume <--- DMIC6 (DMIC01)
# PCM7 <--- volume <--- DMIC7 (DMIC16k)
#
dnl PIPELINE_PCM_ADD(pipeline,
@ -34,19 +37,19 @@ dnl period, priority, core,
dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)
# Passthrough capture pipeline 6 on PCM 6 using max channels 2
`# Passthrough capture pipeline 6 on PCM 6 using max channels 'ACHANNEL
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
6, 6, 2, s16le,
6, 6, ACHANNEL, AFORMAT,
1000, 0, 0,
48000, 48000, 48000)
ARATE, ARATE, ARATE)
# Passthrough capture pipeline 7 on PCM 7 using max channels 4.
`# Passthrough capture pipeline 7 on PCM 7 using max channels 'BCHANNEL
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture-16khz.m4,
7, 7, 4, s32le,
7, 7, BCHANNEL, BFORMAT,
1000, 0, 0,
16000, 16000, 16000)
BRATE, BRATE, BRATE)
#
# DAIs configuration
@ -58,17 +61,17 @@ dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)
# capture DAI is DMIC 0 using 2 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
`# Buffers use 'AFORMAT `format, 1000us deadline on core 0 with priority 0'
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 2, s16le,
PIPELINE_SINK_6, 2, AFORMAT,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
# capture DAI is DMIC 1 using 2 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
`# Buffers use 'BFORMAT `format, 1000us deadline on core 0 with priority 0'
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 2, s32le,
PIPELINE_SINK_7, 2, BFORMAT,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
@ -87,14 +90,14 @@ 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, unmute time, type,
dnl dai_index, pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
DMIC_WORD_LENGTH(s16le), 400, DMIC, 0,
PDM_CONFIG(DMIC, 0, STEREO_PDM0)))
DMIC_CONFIG(1, 500000, 4800000, 40, 60, ARATE,
DMIC_WORD_LENGTH(AFORMAT), 400, DMIC, 0,
PDM_CONFIG(DMIC, 0, APDM)))
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, unmute time, type,
dnl dai_index, pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000,
DMIC_WORD_LENGTH(s32le), 400, DMIC, 1,
PDM_CONFIG(DMIC, 1, FOUR_CH_PDM0_PDM1)))
DMIC_CONFIG(1, 500000, 4800000, 40, 60, BRATE,
DMIC_WORD_LENGTH(BFORMAT), 400, DMIC, 1,
PDM_CONFIG(DMIC, 1, BPDM)))

76
tools/topology/sof-apl-dmic-b2ch.m4
View File

@ -1,76 +0,0 @@
#
# Topology for Apollo Lake with direct attach digital microphones array
#
# Capture configuration
# DAI0 none
# DAI1 2ch 32b mic3-4
# 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
#
# PCM7 <----- DMIC7 (DMIC16k)
#
dnl PIPELINE_PCM_ADD(pipeline,
dnl pipe id, pcm, max channels, format,
dnl period, priority, core,
dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)
# Passthrough capture pipeline 7 on PCM 7 using max channels 2.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture-16khz.m4,
7, 7, 2, s32le,
1000, 0, 0,
16000, 16000, 16000)
#
# DAIs configuration
#
dnl DAI_ADD(pipeline,
dnl pipe id, dai type, dai_index, dai_be,
dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)
# capture DAI is DMIC 1 using 2 periods
# Buffers use s32le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 2, s32le,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
dnl PCM_CAPTURE_ADD(name, pipeline, capture)
PCM_CAPTURE_ADD(DMIC16kHz, 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, 1, 7, NoCodec-7,
dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max,
dnl sample_rate, fifo word length, unmute time, type,
dnl dai_index, pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000,
DMIC_WORD_LENGTH(s32le), 400, DMIC, 1,
PDM_CONFIG(DMIC, 1, STEREO_PDM1)))