Skip to content

Commit f35420b

Browse files
ujfalusilgirdwood
authored andcommitted
Revert "topology2: Update deep buffer and BT offload for ptl rt722 topology"
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 <peter.ujfalusi@linux.intel.com>
1 parent fc387ab commit f35420b

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

tools/topology/topology2/cavs-sdw.conf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ Define {
7070
DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1'
7171
DEEP_BUFFER_PIPELINE_SINK 'mixout.1.1'
7272
DEEP_BUFFER_PCM_NAME 'Deepbuffer Jack Out'
73-
DEEP_BUFFER_PIPELINE_ID_2 16
74-
DEEP_BUFFER_PCM_ID_2 35
75-
DEEP_BUFFER_PIPELINE_SRC_2 'mixin.16.1'
76-
DEEP_BUFFER_PIPELINE_SINK_2 'mixout.21.1'
77-
DEEP_BUFFER_PCM_NAME_2 'Deepbuffer Amps'
7873
SDW_JACK_OUT_STREAM 'SDW0-Playback'
7974
SDW_JACK_IN_STREAM 'SDW0-Capture'
8075
SDW_JACK_OUT_BE_ID 0
@@ -97,7 +92,6 @@ Define {
9792
EFX_MIC_TDFB_PARAMS "line2_generic_pm10deg"
9893
EFX_MIC_DRC_PARAMS "dmic_default"
9994
DMIC0_DAI_EQIIR "highpass_40hz_20db"
100-
SPEAKER_PCM_CORE_ID 0
10195
}
10296

10397
# override defaults with platform-specific config

tools/topology/topology2/production/tplg-targets-ace3.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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
3636
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
3737
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
3838
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt722-4ch.bin,DMIC0_ENHANCED_CAPTURE=true,\
39-
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\
40-
BT_NAME=SSP2-BT,BT_PCM_ID=20,BT_ID=10,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
41-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
39+
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default"
4240

4341
"cavs-sdw\;sof-ptl-rt712-l2-rt1320-l1\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=2,\
4442
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\

0 commit comments

Comments
 (0)