From 881df24e13284a64a5be08269fe4fe6fca0cefb7 Mon Sep 17 00:00:00 2001 From: Pin-chih Lin Date: Sun, 7 Jan 2024 19:53:54 +0800 Subject: [PATCH] topology1: add DRC/EQ integrated topologies Adds new topology builds integrating DRC/EQ on Speaker pipeline. Signed-off-by: Pin-chih Lin (cherry picked from commit cdb87ad46cc3078d0fd230f1a6aa0707ba5527b1) --- tools/topology/topology1/CMakeLists.txt | 16 ++++++++++++++++ tools/topology/topology1/sof-adl-nau8825.m4 | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index 813e84d6f30e..9a04a9bd2aba 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -195,6 +195,22 @@ set(TPLGS "sof-jsl-rt5682\;sof-jsl-rt5682-mx98360a\;-DPLATFORM=jsl-dedede" "sof-jsl-rt5682\;sof-jsl-cs42l42-mx98360a\;-DPLATFORM=jsl-dedede" + ## DRC/EQ topologies + "sof-tgl-max98357a-rt5682\;sof-adl-max98357a-rt5682-drceq\;-DCODEC=MAX98357A\;-DFMT=s16le\;-DPLATFORM=adl\;-DLINUX_MACHINE_DRIVER=sof_rt5682\;-DAMP_SSP=2\;-DDYNAMIC=1\;-DDRC_EQ" + "sof-tgl-max98357a-rt5682\;sof-adl-max98360a-rt5682-drceq\;-DCODEC=MAX98360A\;-DFMT=s32le\;-DPLATFORM=adl\;-DLINUX_MACHINE_DRIVER=sof_rt5682\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DSPK_MIC_PERIOD_US=10000\;-DDYNAMIC=1\;-DDRC_EQ" + "sof-tgl-max98357a-rt5682\;sof-adl-max98390-rt5682-drceq\;-DCODEC=MAX98390\;-DFMT=s32le\;-DPLATFORM=adl\;-DLINUX_MACHINE_DRIVER=sof_rt5682\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DDYNAMIC=1\;-DDRC_EQ" + "sof-tgl-max98357a-rt5682\;sof-adl-max98390-ssp2-rt5682-ssp0-drceq\;-DCODEC=MAX98390\;-DFMT=s32le\;-DPLATFORM=adl\;-DLINUX_MACHINE_DRIVER=sof_rt5682\;-DAMP_SSP=2\;-DDYNAMIC=1\;-DDRC_EQ" + "sof-tgl-max98357a-rt5682\;sof-adl-rt1019-rt5682-drceq\;-DCODEC=RT1019\;-DFMT=s24le\;-DPLATFORM=adl\;-DLINUX_MACHINE_DRIVER=sof_rt5682\;-DAMP_SSP=1\;-DSPK_MIC_PERIOD_US=10000\;-DBT_OFFLOAD\;-DDYNAMIC=1\;-DDRC_EQ" + "sof-tgl-max98357a-rt5682\;sof-adl-cs35l41-drceq\;-DCODEC=CS35L41\;-DFMT=s24le\;-DPLATFORM=adl\;-DLINUX_MACHINE_DRIVER=sof_ssp_amp\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DNO_HEADPHONE\;-DDYNAMIC=1\;-DDRC_EQ" + "sof-tgl-max98357a-rt5682\;sof-adl-max98360a-da7219-drceq\;-DUSE_DA7219\;-DCODEC=MAX98360A\;-DFMT=s32le\;-DPLATFORM=adl\;-DLINUX_MACHINE_DRIVER=sof_rt5682\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DSPK_MIC_PERIOD_US=10000\;-DNOHOTWORD\;-DNO16KDMIC\;-DDRC_EQ" + "sof-tgl-max98357a-rt5682\;sof-adl-rt5650-drceq\;-DUSE_RT5650\;-DFMT=s24le\;-DPLATFORM=adl\;-DLINUX_MACHINE_DRIVER=sof_rt5682\;-DAMP_SSP=1\;-DSPK_MIC_PERIOD_US=10000\;-DBT_OFFLOAD\;-DNOHOTWORD\;-DNO16KDMIC\;-DDRC_EQ" + + "sof-adl-nau8825\;sof-adl-max98360a-nau8825-drceq\;-DCODEC=MAX98360A\;-DFMT=s16le\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DSPK_MIC_PERIOD_US=10000\;-DDYNAMIC=1\;-DDRC_EQ" + "sof-adl-nau8825\;sof-adl-rt1019-nau8825-drceq\;-DCODEC=RT1019P\;-DFMT=s16le\;-DAMP_SSP=2\;-DSPK_MIC_PERIOD_US=10000\;-DDYNAMIC=1\;-DDRC_EQ" + "sof-adl-nau8825\;sof-adl-rt1015-nau8825-drceq\;-DCODEC=RT1015P\;-DFMT=s32le\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DSPK_MIC_PERIOD_US=10000\;-DDYNAMIC=1\;-DDRC_EQ" + "sof-adl-nau8825\;sof-adl-nau8318-nau8825-drceq\;-DCODEC=NAU8318\;-DFMT=s16le\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DSPK_MIC_PERIOD_US=10000\;-DDYNAMIC=1\;-DDRC_EQ" + ## end DRC/EQ topologies + "sof-glk-es8336\;sof-apl-es8336\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=0" "sof-glk-es8336\;sof-apl-es8336-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=0" "sof-glk-es8336\;sof-apl-es8336-ssp0\;-DPLATFORM=bxt\;-DSSP_NUM=0\;-DCHANNELS=0" diff --git a/tools/topology/topology1/sof-adl-nau8825.m4 b/tools/topology/topology1/sof-adl-nau8825.m4 index d2feb681197d..1ff4a926b93e 100644 --- a/tools/topology/topology1/sof-adl-nau8825.m4 +++ b/tools/topology/topology1/sof-adl-nau8825.m4 @@ -181,7 +181,9 @@ ifdef(`NO_AMP',,` ifdef(`SMART_AMP',,` # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline with priority 0 on core 0 -PIPELINE_PCM_ADD(sof/pipe-volume-demux-playback.m4, +PIPELINE_PCM_ADD( + ifdef(`DRC_EQ', sof/pipe-drc-eq-volume-demux-playback.m4, + sof/pipe-volume-demux-playback.m4), 1, 0, 2, s32le, SPK_MIC_PERIOD_US, 0, SPK_PLAYBACK_CORE, 48000, 48000, 48000)')')