From ba26eeff9df6a422e57b83f6ffe3a973d99d6250 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Thu, 14 Apr 2022 12:45:13 -0700 Subject: [PATCH] topology2: cavs-nocodec: Add support for MTL nocodec topology The key difference is the DMIC HW IP version. Signed-off-by: Ranjani Sridharan --- tools/topology/topology2/cavs/CMakeLists.txt | 3 +++ tools/topology/topology2/cavs/cavs-nocodec.conf | 6 ++++++ tools/topology/topology2/cavs/platform/intel/mtl.conf | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 tools/topology/topology2/cavs/platform/intel/mtl.conf diff --git a/tools/topology/topology2/cavs/CMakeLists.txt b/tools/topology/topology2/cavs/CMakeLists.txt index 5c24a41d2..e2ee62e2c 100644 --- a/tools/topology/topology2/cavs/CMakeLists.txt +++ b/tools/topology/topology2/cavs/CMakeLists.txt @@ -28,6 +28,9 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin" # CAVS SSP topology for TGL "cavs-nocodec\;cavs-tgl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-cavs-tgl-nocodec.bin" +# SSP topology for MTL +"cavs-nocodec\;sof-mtl-nocodec\;PLATFORM=mtl,NUM_DMICS=2,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-ace-mtl-nocodec.bin" ) # generate ABI for IPC4 diff --git a/tools/topology/topology2/cavs/cavs-nocodec.conf b/tools/topology/topology2/cavs/cavs-nocodec.conf index 3c3b68f64..dd345dbc8 100644 --- a/tools/topology/topology2/cavs/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs/cavs-nocodec.conf @@ -41,6 +41,12 @@ Define { DMIC0_NAME 'NoCodec-6' DMIC0_PCM_CAPS 'Passthrough Capture 13' DMIC0_PIPELINE_STREAM_NAME 'copier.DMIC.14.1' + PLATFORM "none" +} + +# override defaults with platform-specific config +IncludeByKey.PLATFORM { + "mtl" "platform/intel/mtl.conf" } # include DMIC config if needed. diff --git a/tools/topology/topology2/cavs/platform/intel/mtl.conf b/tools/topology/topology2/cavs/platform/intel/mtl.conf new file mode 100644 index 000000000..f6fa1c112 --- /dev/null +++ b/tools/topology/topology2/cavs/platform/intel/mtl.conf @@ -0,0 +1,4 @@ +# MTL-specific variable definitions +Define { + DMIC_DRIVER_VERSION 3 +}