Revert "topology2: Update deep buffer and BT offload for ptl rt722 to…

…pology" This reverts commit f657de7. 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 <[email protected]>
thesofproject · Feb 11, 2025 · f35420b · f35420b
1 parent fc387ab
commit f35420b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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,\