topology2: add new topologies

Add new topologies for testing. Signed-off-by: Bard Liao <[email protected]>
bardliao · Nov 20, 2024 · 4d7a224 · 4d7a224
1 parent c8dc0cb
commit 4d7a224
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/tools/topology/topology2/production/tplg-targets-ace2.cmake b/tools/topology/topology2/production/tplg-targets-ace2.cmake
@@ -32,6 +32,12 @@ NUM_DMICS=2,PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,\
 PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-rt713-l0-rt1318-l1-2ch.bin,\
 HDMI1_ID=6,HDMI2_ID=7,HDMI3_ID=8"
 
+"cavs-sdw\;sof-lnl-rt712-l0-rt1320-l0-4ch\;PLATFORM=lnl,NUM_SDW_AMP_LINKS=2,\
+SDW_SPK_STREAM=SDW1-Playback,SDW_AMP_FEEDBACK=false,\
+NUM_DMICS=2,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
+PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-rt712-l0-rt1320-l0-4ch.bin,\
+HDMI1_ID=7,HDMI2_ID=8,HDMI3_ID=9"
+
 #SDCA multi-function
 "cavs-sdw\;sof-lnl-sdca-jack-id0\;PLATFORM=lnl,SDW_JACK_OUT_STREAM=Playback-SimpleJack,\
 SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0"

diff --git a/tools/topology/topology2/production/tplg-targets-hda-generic.cmake b/tools/topology/topology2/production/tplg-targets-hda-generic.cmake
@@ -4,10 +4,17 @@
 list(APPEND TPLGS
 # HDMI only topology with passthrough pipelines
 "sof-hda-generic\;sof-hda-generic-idisp\;"
+
 # HDMI only topology with passthrough pipelines and
 # 2 or 4 DMIC, no NHLT blob included in topology
 "sof-hda-generic\;sof-hda-generic-idisp-2ch\;NUM_DMICS=2"
 "sof-hda-generic\;sof-hda-generic-idisp-4ch\;NUM_DMICS=4"
+
+# Separated HDMI topologies
+"sof-hda-generic\;sof-hda-idisp-id1\;"
+"sof-hda-generic\;sof-hda-dmic-2ch-id6\;NUM_HDMIS=0,NUM_DMICS=2"
+"sof-hda-generic\;sof-hda-dmic-4ch-id6\;NUM_HDMIS=0,NUM_DMICS=4"
+
 # HDA topology with mixer-based pipelines for HDA and
 # passthrough pipelines for HDMI
 "sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix,HDA_MIC_ENHANCED_CAPTURE=true,\