From afff9efff72f095eb1d5540968af147e008776df Mon Sep 17 00:00:00 2001 From: Balamurugan C Date: Tue, 9 Jan 2024 16:23:52 +0530 Subject: [PATCH] topology2: mtl: Add HDMI-in capture support for non SSP codec products. Adding support for the product which doesn't have no ssp codec but need to support HDMI audio playback and HDMI-in capture via I2S. Signed-off-by: Balamurugan C --- .../topology/topology2/cavs-hdmi-in-ssp.conf | 76 +++++++++++++++++++ .../topology2/sof-ace-tplg/tplg-targets.cmake | 4 + 2 files changed, 80 insertions(+) create mode 100644 tools/topology/topology2/cavs-hdmi-in-ssp.conf diff --git a/tools/topology/topology2/cavs-hdmi-in-ssp.conf b/tools/topology/topology2/cavs-hdmi-in-ssp.conf new file mode 100644 index 000000000000..35d487401e9c --- /dev/null +++ b/tools/topology/topology2/cavs-hdmi-in-ssp.conf @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Define { + # override HDMI-IN/DMIC default definitions + HDMI_IN_1_ID 0 + HDMI_IN_2_ID 1 + DMIC0_ID 3 + DMIC1_ID 4 + # override HDMI BE link ids + NUM_HDMIS 3 + HDMI1_ID 5 + HDMI2_ID 6 + HDMI3_ID 7 + PLATFORM "none" +} + +# override defaults with platform-specific config +IncludeByKey.PLATFORM { + "mtl" "platform/intel/mtl.conf" +} + +# include HDMI-in capture config. +IncludeByKey.HDMI_IN_CAPTURE { + "true" "platform/intel/hdmi-in-capture.conf" +} + +# include HDMI config if needed. +IncludeByKey.NUM_HDMIS { + "[3-4]" "platform/intel/hdmi-generic.conf" +} diff --git a/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake b/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake index be4bf922a86f..0f76e048dc8f 100644 --- a/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake +++ b/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake @@ -84,6 +84,10 @@ GOOGLE_RTC_AEC_SUPPORT=1,DEEP_BUF_SPK=true,PLAYBACK_PIPELINE_SRC=dts" NHLT_BIN=nhlt-sof-mtl-es83x6-ssp1-hdmi-ssp02.bin,HEADSET_SSP_DAI_INDEX=1,\ HEADSET_CODEC_NAME=SSP1-Codec,HDMI_IN_CAPTURE=true" +#Nocodec + HDMI-IN + HDMI +"cavs-hdmi-in-ssp\;sof-mtl-hdmi-ssp02\;PLATFORM=mtl,PREPROCESS_PLUGINS=nhlt,\ +NHLT_BIN=nhlt-sof-mtl-hdmi-ssp02.bin,HDMI_IN_CAPTURE=true" + # SDW + DMIC + HDMI "cavs-sdw\;sof-mtl-sdw-cs42l42-l0-max98363-l2\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\ PDM1_MIC_B_ENABLE=1,DMIC0_ID=3,DMIC1_ID=4,\