From 76af243df9e31399113cba19a9d40d19af70b497 Mon Sep 17 00:00:00 2001 From: Uday M Bhat Date: Fri, 8 Nov 2024 21:15:08 +0530 Subject: [PATCH 1/4] topology2: Update I2S MAX98260a, RT5682, 2 DMICs topology for PTL platform PTL blobs are different for I2S. This entry will create a topology for I2S MAX98360a(SSP1), RT5682(SSP0) codecs, BT at SSP2 and PDM0, PDM1 DMIC. This also enables deep buffer for speaker and headset Signed-off-by: Uday M Bhat (cherry picked from commit 7303db20f8bb61f5fab6c6979eefe7f72d3f2f99) --- tools/topology/topology2/development/tplg-targets.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake index 3c74173fa668..52c19f85976c 100644 --- a/tools/topology/topology2/development/tplg-targets.cmake +++ b/tools/topology/topology2/development/tplg-targets.cmake @@ -104,6 +104,12 @@ NHLT_BIN=nhlt-sof-ptl-max98357a-rt5682-ssp2-ssp0.bin,DEEPBUFFER_FW_DMA_MS=10,HEA SPK_ID=6,SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\ BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,DEEP_BUF_SPK=true" +# Topology for PTL with rt5682 (SSP 0), max98360a (SSP 1), BT (SSP 2) and PDM0, PDM1 enabled +"cavs-rt5682\;sof-ptl-max98360a-rt5682\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\ +PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\ +NHLT_BIN=nhlt-sof-ptl-max98360a-rt5682.bin,SPK_ID=6,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true,\ +BT_NAME=SSP2-BT,BT_ID=7,BT_PCM_NAME=Bluetooth,DEEP_BUF_SPK=true" + # CAVS HDA topology with mixer-based efx eq pipelines for HDA and passthrough pipelines for HDMI "sof-hda-generic\;sof-hda-efx-generic\;HDA_CONFIG=efx,HDA_MIC_ENHANCED_CAPTURE=true,\ EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,EFX_DRC_PARAMS=passthrough,\ From 9179caa6d86a826eaccee04e30c8ff8b795f80ca Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Mon, 18 Nov 2024 10:38:18 +0800 Subject: [PATCH 2/4] Topology2: add sof-ptl-rt712-l2-rt1320-l1 support rt712_vb on SDW link2 and 1 rt1320 on SDW link2. This is one of the audio configurations on Realtek Gen6 AIOC. Signed-off-by: Bard Liao (cherry picked from commit 8ab068a1d65025777ad92081baa71b19825bfba1) --- tools/topology/topology2/production/tplg-targets-ace3.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/topology/topology2/production/tplg-targets-ace3.cmake b/tools/topology/topology2/production/tplg-targets-ace3.cmake index f40d999261ba..8b878e708a1e 100644 --- a/tools/topology/topology2/production/tplg-targets-ace3.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace3.cmake @@ -25,4 +25,8 @@ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture- SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt722-4ch.bin" +"cavs-sdw\;sof-ptl-rt712-l2-rt1320-l1\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=2,\ +SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ +SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" + ) From 23ce4465135ef31d393011969531ba6c6179f170 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Mon, 18 Nov 2024 15:41:40 +0800 Subject: [PATCH 3/4] Topology2: add sof-ptl-rt713-l2-rt1320-l13 support rt713_vb on SoundWire link 2 and rt1320 on SoundWire link 1 and 3. Which is another configuration of Realtek Gen6 AIOC. Signed-off-by: Bard Liao (cherry picked from commit c3fb7b27c404b17c0c975d7f62f24e76bba898bb) --- tools/topology/topology2/production/tplg-targets-ace3.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/topology/topology2/production/tplg-targets-ace3.cmake b/tools/topology/topology2/production/tplg-targets-ace3.cmake index 8b878e708a1e..a7338cad72e8 100644 --- a/tools/topology/topology2/production/tplg-targets-ace3.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace3.cmake @@ -29,4 +29,7 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt722-4ch.bin" SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" +"cavs-sdw\;sof-ptl-rt713-l2-rt1320-l13\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=2,\ +SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ +SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" ) From 8263456c16759c6031016a0fb1523ef20c800c2e Mon Sep 17 00:00:00 2001 From: Uday M Bhat Date: Fri, 29 Nov 2024 19:31:31 +0530 Subject: [PATCH 4/4] topology2: Add HDA with DMIC, HDMI topologies support for ACE3 architecture These entries creates multiple topologies for the HDA codec with 2, 4 DMICs and HDMI for ACE 3 architecture Signed-off-by: Uday M Bhat (cherry picked from commit 0b3ee3a05a96cb0aef2017a77f41e39a149a4748) --- .../production/tplg-targets-hda-generic.cmake | 20 +++++++++++++++++++ tools/topology/topology2/sof-hda-generic.conf | 1 + 2 files changed, 21 insertions(+) diff --git a/tools/topology/topology2/production/tplg-targets-hda-generic.cmake b/tools/topology/topology2/production/tplg-targets-hda-generic.cmake index f2eacc8c4798..e2f64cbe22f7 100644 --- a/tools/topology/topology2/production/tplg-targets-hda-generic.cmake +++ b/tools/topology/topology2/production/tplg-targets-hda-generic.cmake @@ -67,4 +67,24 @@ EFX_DMIC0_DRC_PARAMS=dmic_default" PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace1-4ch.bin,DMIC0_ENHANCED_CAPTURE=true,\ EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" + +# Topologies for ACE3 architecture +# HDMI + DMICs +"sof-hda-generic\;sof-hda-generic-ace3-idisp-2ch\;PLATFORM=ptl,NUM_DMICS=2,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace3-idisp-2ch.bin" + +"sof-hda-generic\;sof-hda-generic-ace3-idisp-4ch\;PLATFORM=ptl,NUM_DMICS=4,\ +PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace3-idisp-4ch.bin" + +# HDA + HDMI + DMICs +"sof-hda-generic\;sof-hda-generic-ace3-2ch\;PLATFORM=ptl,HDA_CONFIG=mix,NUM_DMICS=2,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace3-2ch.bin,\ +DMIC0_ENHANCED_CAPTURE=true,EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,\ +EFX_DMIC0_DRC_PARAMS=dmic_default" + +"sof-hda-generic\;sof-hda-generic-ace3-4ch\;PLATFORM=ptl,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-ace3-4ch.bin,DMIC0_ENHANCED_CAPTURE=true,\ +EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" ) diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf index 503871d74b2d..4442e60813a3 100644 --- a/tools/topology/topology2/sof-hda-generic.conf +++ b/tools/topology/topology2/sof-hda-generic.conf @@ -58,6 +58,7 @@ Define { IncludeByKey.PLATFORM { "mtl" "platform/intel/mtl.conf" "lnl" "platform/intel/lnl.conf" + "ptl" "platform/intel/ptl.conf" } # include HDA config if needed.