Skip to content

topology: enable eq pipeline when EQ is enabled in makefile #2558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Mar 26, 2020
Merged

topology: enable eq pipeline when EQ is enabled in makefile #2558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tools/topology/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ set(TPLGS
"sof-cnl-rt274\;sof-cnl-rt274"
"sof-apl-tdf8532\;sof-apl-tdf8532"
"sof-apl-pcm512x\;sof-apl-pcm512x"
"sof-apl-pcm512x-nohdmi\;sof-apl-pcm512x-nohdmi"
"sof-apl-pcm512x-nohdmi\;sof-apl-pcm512x-nohdmi\;-DPPROC=volume"
"sof-apl-demux-pcm512x\;sof-apl-demux-pcm512x"
"sof-apl-rt298\;sof-apl-rt298"
"sof-apl-wm8804\;sof-apl-wm8804"
Expand All @@ -70,17 +70,17 @@ set(TPLGS
"sof-glk-da7219\;sof-glk-da7219"
"sof-glk-rt5682\;sof-glk-rt5682"
"sof-icl-nocodec\;sof-icl-nocodec"
"sof-apl-eq-pcm512x\;sof-apl-eq-pcm512x"
"sof-apl-eq-dmic\;sof-apl-eq-dmic"
"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-a96k-b16k\;sof-apl-dmic-a96k-b16k"
"sof-apl-dmic\;sof-apl-dmic-4ch\;-DCHANNELS=4"
"sof-apl-dmic\;sof-apl-dmic-2ch\;-DCHANNELS=2"
"sof-apl-dmic\;sof-apl-dmic-4ch\;-DCHANNELS=4\;-DCPROC=volume"
"sof-apl-dmic\;sof-apl-dmic-2ch\;-DCHANNELS=2\;-DCPROC=volume"
"sof-apl-src-50khz-pcm512x\;sof-apl-src-50khz-pcm512x"
"sof-icl-dmic-4ch\;sof-icl-dmic-4ch"
"sof-icl-rt700\;sof-icl-rt700\;-DPLATFORM=icl"
Expand Down
13 changes: 11 additions & 2 deletions tools/topology/sof-apl-dmic.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,16 @@ define(DMIC_PDM_CONFIG, ifelse(CHANNELS, `4', ``FOUR_CH_PDM0_PDM1'',
#
# Define the pipelines
#
# PCM6 <----- DMIC6 (DMIC01)
# CPROC is for capture pipeline processing, i.e volume, eq, eq-iir, eq-fir etc
# In this file, volume and eq are used. If anything else is used, please update
# pipeline comments below for tracking purpose.
#
ifelse(CPROC, `volume', `# PCM6 <----- DMIC6 (DMIC01)',
`ifelse(CPROC, `eq', `# PCM6 <---- EQ IIR <----- DMIC6 (DMIC01)', `')')

# The pipeline naming notation is pipe-PROCESSING-DIRECTION.m4
define(PIPE_PROC_CAPTURE, `sof/pipe-`CPROC'-capture.m4')

# PCM7 <----- DMIC7 (DMIC16k)
#

Expand All @@ -35,7 +44,7 @@ dnl time_domain, sched_comp)

# Passthrough capture pipeline 6 on PCM 6 using max channels defined by CHANNELS.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(PIPE_PROC_CAPTURE,
6, 6, CHANNELS, s32le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down
74 changes: 0 additions & 74 deletions tools/topology/sof-apl-eq-dmic.m4
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions tools/topology/sof-apl-eq-pcm512x.m4
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 deletions tools/topology/sof-apl-pcm512x-nohdmi.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,17 @@ DEBUG_START
#
# Define the pipelines
#
# PCM0 ----> volume -----> SSP5 (pcm512x)
# PPROC is for playback pipeline processing, i.e volume, eq-volume, eq-iir, eq-fir etc
# In this file, volume and eq-volume are used. If anything else is used, please update
# pipeline comments below for tracking purpose.
#
ifelse(PPROC, `volume', `# PCM0 ----> volume -----> SSP5 (pcm512x)',
`ifelse(PPROC, `eq-volume',
`# PCM0 ----> EQ IIR ----> EQ FIR ----> volume ----> SSP5 (pcm512x)', `')')
#
# The pipeline naming notation is pipe-PROCESSING-DIRECTION.m4
define(PIPE_PROC_PLAYBACK, `sof/pipe-`PPROC'-playback.m4')


dnl PIPELINE_PCM_ADD(pipeline,
dnl pipe id, pcm, max channels, format,
Expand All @@ -33,7 +42,7 @@ dnl time_domain, sched_comp)

# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
PIPELINE_PCM_ADD(PIPE_PROC_PLAYBACK,
1, 0, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down