From 5cf1c9c0d67c09437bff0db6e3bda4c7a1b0fbb5 Mon Sep 17 00:00:00 2001 From: "barry.jan" Date: Fri, 10 Nov 2023 15:59:55 +0800 Subject: [PATCH] topology: Add Waves codec to MT8188 topology Modify sof-mt8188-mt6359 topology so Waves codec can be added to playback in case 'WAVES' is defined. Signed-off-by: barry.jan --- .../xtensa/configs/override/mt8188_chrome_waves.config | 2 ++ tools/topology/topology1/CMakeLists.txt | 1 + tools/topology/topology1/sof-mt8188-mt6359.m4 | 8 ++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/arch/xtensa/configs/override/mt8188_chrome_waves.config diff --git a/src/arch/xtensa/configs/override/mt8188_chrome_waves.config b/src/arch/xtensa/configs/override/mt8188_chrome_waves.config new file mode 100644 index 000000000000..6e0143275ba6 --- /dev/null +++ b/src/arch/xtensa/configs/override/mt8188_chrome_waves.config @@ -0,0 +1,2 @@ +CONFIG_COMP_MODULE_ADAPTER=y +CONFIG_WAVES_CODEC=y diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index 03e2fd4fed3a..8869a8bd7d1b 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -78,6 +78,7 @@ set(TPLGS "sof-mt8186-mt6366\;sof-mt8186-dts\;-DDTS=`DTS'" "sof-mt8186-mt6366\;sof-mt8186-mt6366-rt1019-rt5682s-waves\;-DWAVES=1" "sof-mt8188-mt6359\;sof-mt8188" + "sof-mt8188-mt6359\;sof-mt8188-waves\;-DWAVES=1" "sof-acp-renoir\;sof-acp" "sof-rn-rt5682-rt1019\;sof-rn-rt5682-rt1019" diff --git a/tools/topology/topology1/sof-mt8188-mt6359.m4 b/tools/topology/topology1/sof-mt8188-mt6359.m4 index f649f366c96d..4244964561db 100644 --- a/tools/topology/topology1/sof-mt8188-mt6359.m4 +++ b/tools/topology/topology1/sof-mt8188-mt6359.m4 @@ -34,19 +34,23 @@ dnl period, priority, core, dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) +define(`ENDPOINT_NAME', `Speakers') # Low Latency playback pipeline 1 on PCM 16 using max 2 channels of s16le # Set 1000us deadline with priority 0 on core 0 -PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, +PIPELINE_PCM_ADD(ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-passthrough-playback.m4), 1, 16, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) +undefine(`ENDPOINT_NAME') +define(`ENDPOINT_NAME', `Headphones') # Low Latency playback pipeline 2 on PCM 17 using max 2 channels of s16le # Set 1000us deadline with priority 0 on core 0 -PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, +PIPELINE_PCM_ADD(ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-passthrough-playback.m4), 2, 17, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) +undefine(`ENDPOINT_NAME') # Low Latency capture pipeline 3 on PCM 18 using max 2 channels of s16le # Set 2000us deadline with priority 0 on core 0