From ae62c2c0c2645358b1480428a776635e6b99b932 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Mon, 16 Jan 2023 17:42:58 +0800 Subject: [PATCH 1/2] topology2: add missing nhlt Somehow some SoundWire topologies don't have PREPROCESS_PLUGINS=nhlt definition. It leads to nhlt is not included in those topologies. Signed-off-by: Bard Liao --- tools/topology/topology2/avs-tplg/CMakeLists.txt | 14 +++++++++----- .../topology/topology2/development/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/topology/topology2/avs-tplg/CMakeLists.txt b/tools/topology/topology2/avs-tplg/CMakeLists.txt index 2351c3b226f7..d0bbf64f5497 100644 --- a/tools/topology/topology2/avs-tplg/CMakeLists.txt +++ b/tools/topology/topology2/avs-tplg/CMakeLists.txt @@ -15,23 +15,27 @@ DEEPBUFFER_FW_DMA_MS=100" HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100" # CAVS SDW topology with passthrough pipelines -"cavs-sdw\;cavs-sdw\;DEEPBUFFER_FW_DMA_MS=100" +"cavs-sdw\;cavs-sdw\;DEEPBUFFER_FW_DMA_MS=100,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-cavs-sdw.bin" # IPC4 topology for TGL rt711 Headset + rt1316 Amplifier + rt714 DMIC -"cavs-sdw\;sof-tgl-rt711-rt1316-rt714\;NUM_SDW_AMPS=2,SDW_DMIC=1" +"cavs-sdw\;sof-tgl-rt711-rt1316-rt714\;NUM_SDW_AMPS=2,SDW_DMIC=1,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-rt711-rt1316-rt714.bin" # IPC4 topology for TGL rt711 Headset + rt1308 Amplifier + rt715 DMIC "cavs-sdw\;sof-tgl-rt715-rt711-rt1308-mono\;NUM_SDW_AMPS=1,SDW_DMIC=1,\ SDW_JACK_OUT_STREAM=SDW1-Playback,SDW_JACK_IN_STREAM=SDW1-Capture,\ -SDW_SPK_STREAM=SDW2-Playback,SDW_DMIC_STREAM=SDW0-Capture" +SDW_SPK_STREAM=SDW2-Playback,SDW_DMIC_STREAM=SDW0-Capture,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-rt715-rt711-rt1308-mono.bin" # IPC4 topology for TGL rt711 Headset + rt1308 Amplifier + PCH DMIC "cavs-sdw\;sof-tgl-rt711-rt1308-4ch\;NUM_SDW_AMPS=1,NUM_DMICS=4,DMIC0_ID=3,\ -DMIC1_ID=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1" +DMIC1_ID=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,\ +NHLT_BIN=nhlt-sof-tgl-rt711-rt1308-4ch.bin" "cavs-sdw\;sof-adl-rt711-4ch\;DEEPBUFFER_FW_DMA_MS=100,NUM_DMICS=4,DMIC0_ID=2,\ DMIC1_ID=3,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,HDMI1_ID=4,HDMI2_ID=5,\ -HDMI3_ID=6" +HDMI3_ID=6,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-rt711-4ch.bin" ) add_custom_target(topology2_cavs) diff --git a/tools/topology/topology2/development/CMakeLists.txt b/tools/topology/topology2/development/CMakeLists.txt index 6d251095544f..1c555c87fc67 100644 --- a/tools/topology/topology2/development/CMakeLists.txt +++ b/tools/topology/topology2/development/CMakeLists.txt @@ -18,7 +18,7 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=1 PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100" # SDW + HDMI topology for MTL -"cavs-sdw\;mtl-sdw-hdmi\;" +"cavs-sdw\;mtl-sdw-hdmi\;PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-mtl-sdw-hdmi.bin" # SSP topology for MTL "cavs-nocodec\;sof-mtl-nocodec\;PLATFORM=mtl,NUM_DMICS=2,\ From 111ddcc651f00a6a20be335b48accbd9f9317e03 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Mon, 16 Jan 2023 21:35:45 +0800 Subject: [PATCH 2/2] topology2: cavs-sdw: remove default value of DMIC_DRIVER_VERSION DMIC_DRIVER_VERSION=3 is already set in mtl.conf. Other platforms should use the default value in dmic-default.conf Signed-off-by: Bard Liao --- tools/topology/topology2/cavs-sdw.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index c5efbbca317a..c352ef270721 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -36,7 +36,6 @@ Define { DMIC_IO_CLK 38400000 NUM_DMICS 0 - DMIC_DRIVER_VERSION 3 # override DMIC default definitions PDM1_MIC_A_ENABLE 1 PDM1_MIC_B_ENABLE 1