From 890398a6455ac54336be794063db7aca9e0956a4 Mon Sep 17 00:00:00 2001 From: Fred Oh Date: Thu, 12 Mar 2020 22:44:40 -0700 Subject: [PATCH] topology: add equalizer to cml rt1011 rt5682 topology Add EQIIR and EQFIR to first playback pipeline. This help to expand more equalizer testing across platforms. Signed-off-by: Fred Oh --- tools/topology/CMakeLists.txt | 3 ++- tools/topology/sof-cml-rt1011-rt5682.m4 | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index e33af03d5..5b7880cc6 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -104,7 +104,8 @@ set(TPLGS "sof-cnl-nocodec\;sof-cnl-nocodec" "sof-cml-rt5682-max98357a\;sof-cml-rt5682-max98357a\;-DPLATFORM=cml" "sof-cml-demux-rt5682-max98357a\;sof-cml-demux-rt5682-max98357a\;-DPLATFORM=cml" - "sof-cml-rt1011-rt5682\;sof-cml-rt1011-rt5682\;-DPLATFORM=cml" + "sof-cml-rt1011-rt5682\;sof-cml-rt1011-rt5682\;-DPLATFORM=cml\;-DPPROC=volume" + "sof-cml-rt1011-rt5682\;sof-cml-eq-rt1011-rt5682\;-DPLATFORM=cml\;-DPPROC=eq-volume" "sof-tgl-nocodec\;sof-tgl-nocodec" "sof-tgl-rt711-i2s-rt1308\;sof-tgl-rt711-i2s-rt1308\;-DHDMI=1" "sof-tgl-rt711-i2s-rt1308\;sof-tgl-rt711-i2s-rt1308-nohdmi" diff --git a/tools/topology/sof-cml-rt1011-rt5682.m4 b/tools/topology/sof-cml-rt1011-rt5682.m4 index ee21f5ed2..9892c5141 100644 --- a/tools/topology/sof-cml-rt1011-rt5682.m4 +++ b/tools/topology/sof-cml-rt1011-rt5682.m4 @@ -13,6 +13,10 @@ DEBUG_START # PCM5 ----> volume (pipe 7) ----> SSP1 (speaker - rt1011, BE link 5) # +# The pipeline naming notation is pipe-PROCESSING-DIRECTION.m4 +# PPROC is set by makefile +define(PIPE_PROC_PLAYBACK, `sof/pipe-`PPROC'-playback.m4') + dnl PIPELINE_PCM_ADD(pipeline, dnl pipe id, pcm, max channels, format, dnl period, priority, core, @@ -21,7 +25,7 @@ dnl time_domain, sched_comp) # Low Latency playback pipeline 7 on PCM 5 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, +PIPELINE_PCM_ADD(PIPE_PROC_PLAYBACK, 7, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000)