From b7f096920bd9b4414e035cc26b47dad8f9792c5a Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 23 Jan 2024 11:51:21 +0200 Subject: [PATCH 1/3] topology2: production: cav2.5: Remove NHLT blob from SDW DMIC topologies NHLT blob is not needed in for DMIC on SDW bus. Signed-off-by: Peter Ujfalusi --- .../topology/topology2/production/tplg-targets-cavs25.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/topology/topology2/production/tplg-targets-cavs25.cmake b/tools/topology/topology2/production/tplg-targets-cavs25.cmake index b83fabd928a5..29affed7a7ac 100644 --- a/tools/topology/topology2/production/tplg-targets-cavs25.cmake +++ b/tools/topology/topology2/production/tplg-targets-cavs25.cmake @@ -3,8 +3,7 @@ # Array of "input-file-name;output-file-name;comma separated pre-processor variables" list(APPEND TPLGS # IPC4 topology for TGL rt711 Headset + rt1316 Amplifier + rt714 DMIC -"cavs-sdw\;sof-tgl-rt711-rt1316-rt714\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\ -PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-rt711-rt1316-rt714.bin" +"cavs-sdw\;sof-tgl-rt711-rt1316-rt714\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1" "cavs-sdw\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1" @@ -13,8 +12,7 @@ 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_AMP_LINKS=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_AMP_FEEDBACK=false,\ -PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-rt715-rt711-rt1308-mono.bin" +SDW_SPK_STREAM=SDW2-Playback,SDW_DMIC_STREAM=SDW0-Capture,SDW_AMP_FEEDBACK=false" # IPC4 topology for TGL rt711 Headset + rt1308 Amplifier + PCH DMIC "cavs-sdw\;sof-tgl-rt711-rt1308-4ch\;NUM_SDW_AMP_LINKS=1,NUM_DMICS=4,DMIC0_ID=3,\ From 2be3f350e4dbd672c1fb7e77f703b07f06a35a4f Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 23 Jan 2024 12:16:17 +0200 Subject: [PATCH 2/3] topology2: production: cav2.5: Add sof-adl-rt711-l0-rt1308-l12-rt715-l3 The sof-adl-rt711-l0-rt1308-l12-rt715-l3 is identical configuration as sof-tgl-rt711-rt1308-rt715 At the same time update the comments for better organization. Signed-off-by: Peter Ujfalusi --- .../topology/topology2/production/tplg-targets-cavs25.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/topology/topology2/production/tplg-targets-cavs25.cmake b/tools/topology/topology2/production/tplg-targets-cavs25.cmake index 29affed7a7ac..7cc83feaec05 100644 --- a/tools/topology/topology2/production/tplg-targets-cavs25.cmake +++ b/tools/topology/topology2/production/tplg-targets-cavs25.cmake @@ -2,18 +2,20 @@ # Array of "input-file-name;output-file-name;comma separated pre-processor variables" list(APPEND TPLGS -# IPC4 topology for TGL rt711 Headset + rt1316 Amplifier + rt714 DMIC +# IPC4 topology for TGL/ADL rt711 Headset + rt1316 Amplifier + rt714 DMIC "cavs-sdw\;sof-tgl-rt711-rt1316-rt714\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1" "cavs-sdw\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1" +# IPC4 topology for TGL/ADL rt711 Headset + rt1308 Amplifier + rt715 DMIC "cavs-sdw\;sof-tgl-rt711-rt1308-rt715\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,SDW_AMP_FEEDBACK=false" -# IPC4 topology for TGL rt711 Headset + rt1308 Amplifier + rt715 DMIC "cavs-sdw\;sof-tgl-rt715-rt711-rt1308-mono\;NUM_SDW_AMP_LINKS=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_AMP_FEEDBACK=false" +"cavs-sdw\;sof-adl-rt711-l0-rt1308-l12-rt715-l3\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,SDW_AMP_FEEDBACK=false" + # IPC4 topology for TGL rt711 Headset + rt1308 Amplifier + PCH DMIC "cavs-sdw\;sof-tgl-rt711-rt1308-4ch\;NUM_SDW_AMP_LINKS=1,NUM_DMICS=4,DMIC0_ID=3,\ DMIC1_ID=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,SDW_AMP_FEEDBACK=false,\ From 993797f2d1722d64cfb23f50863f631ee38b6bbe Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 23 Jan 2024 16:37:11 +0200 Subject: [PATCH 3/3] topology2: production: cav2.5: Add sof-adl-rt711-l0-rt1316-l13-rt714-l2 The sof-adl-rt711-l0-rt1316-l13-rt714-l2 similar to sof-adl-rt711-l0-rt1308-l12-rt715-l3 with the SDW DMIC on different link. Signed-off-by: Peter Ujfalusi --- tools/topology/topology2/production/tplg-targets-cavs25.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/topology/topology2/production/tplg-targets-cavs25.cmake b/tools/topology/topology2/production/tplg-targets-cavs25.cmake index 7cc83feaec05..8d68bdac25c9 100644 --- a/tools/topology/topology2/production/tplg-targets-cavs25.cmake +++ b/tools/topology/topology2/production/tplg-targets-cavs25.cmake @@ -7,6 +7,9 @@ list(APPEND TPLGS "cavs-sdw\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1" +"cavs-sdw\;sof-adl-rt711-l0-rt1316-l13-rt714-l2\;NUM_SDW_AMP_LINKS=2,\ +SDW_DMIC=1,SDW_DMIC_STREAM=SDW2-Capture" + # IPC4 topology for TGL/ADL rt711 Headset + rt1308 Amplifier + rt715 DMIC "cavs-sdw\;sof-tgl-rt711-rt1308-rt715\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,SDW_AMP_FEEDBACK=false"