From f35420b2609bda56fbabfbd411101d4f9e12548c Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 11 Feb 2025 13:50:07 +0200 Subject: [PATCH] Revert "topology2: Update deep buffer and BT offload for ptl rt722 topology" This reverts commit f657de746cd11a0ab2fd30abeef9c759f5f52b83. The patch modified a generic topology which can be used on many different devices where the BT offload is not necessarily available, possible. Signed-off-by: Peter Ujfalusi --- tools/topology/topology2/cavs-sdw.conf | 6 ------ tools/topology/topology2/production/tplg-targets-ace3.cmake | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index 657a70dab5d7..4a88c4bd0bad 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -70,11 +70,6 @@ Define { DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1' DEEP_BUFFER_PIPELINE_SINK 'mixout.1.1' DEEP_BUFFER_PCM_NAME 'Deepbuffer Jack Out' - DEEP_BUFFER_PIPELINE_ID_2 16 - DEEP_BUFFER_PCM_ID_2 35 - DEEP_BUFFER_PIPELINE_SRC_2 'mixin.16.1' - DEEP_BUFFER_PIPELINE_SINK_2 'mixout.21.1' - DEEP_BUFFER_PCM_NAME_2 'Deepbuffer Amps' SDW_JACK_OUT_STREAM 'SDW0-Playback' SDW_JACK_IN_STREAM 'SDW0-Capture' SDW_JACK_OUT_BE_ID 0 @@ -97,7 +92,6 @@ Define { EFX_MIC_TDFB_PARAMS "line2_generic_pm10deg" EFX_MIC_DRC_PARAMS "dmic_default" DMIC0_DAI_EQIIR "highpass_40hz_20db" - SPEAKER_PCM_CORE_ID 0 } # override defaults with platform-specific config diff --git a/tools/topology/topology2/production/tplg-targets-ace3.cmake b/tools/topology/topology2/production/tplg-targets-ace3.cmake index 30e81f9bdbee..10d9a4cb867f 100644 --- a/tools/topology/topology2/production/tplg-targets-ace3.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace3.cmake @@ -36,9 +36,7 @@ PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,HDMI1_ID=7,HDMI2_I 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,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt722-4ch.bin,DMIC0_ENHANCED_CAPTURE=true,\ -EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\ -BT_NAME=SSP2-BT,BT_PCM_ID=20,BT_ID=10,BT_PCM_NAME=Bluetooth,ADD_BT=true,\ -DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true" +EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" "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,\