Skip to content

Commit 6e40676

Browse files
committed
Revert "topology2: tplg-targets-sdca-generic: add echo ref to jack and amp"
This reverts commit 96ab79a. The commit will break audio probing on any kernel older than 7.0 and using function topology. We need to figure out something else for echoref, but this must not be released to public.. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 96ab79a commit 6e40676

File tree

1 file changed

+5
-25
lines changed

1 file changed

+5
-25
lines changed

tools/topology/topology2/production/tplg-targets-sdca-generic.cmake

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,23 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
99

1010
# Split topologies
1111
"cavs-sdw\;sof-sdca-jack-id0\;SDW_JACK_OUT_STREAM=Playback-SimpleJack,\
12-
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0,SDW_ECHO_REF_DAI=true,SDW_JACK_ECHO_REF=true"
12+
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0"
1313

1414
"cavs-sdw\;sof-sdca-1amp-id2\;NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
1515
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
16-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
16+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
1717

1818
"cavs-sdw\;sof-sdca-2amp-id2\;NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
1919
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
20-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
20+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
2121

2222
"cavs-sdw\;sof-sdca-3amp-id2\;NUM_SDW_AMP_LINKS=3,SDW_JACK=false,\
2323
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
24-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
24+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
2525

2626
"cavs-sdw\;sof-sdca-4amp-id2\;NUM_SDW_AMP_LINKS=4,SDW_JACK=false,\
2727
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
28-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
29-
30-
"cavs-sdw\;sof-sdca-1amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
31-
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
32-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
33-
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
34-
35-
"cavs-sdw\;sof-sdca-2amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
36-
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
37-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
38-
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
39-
40-
"cavs-sdw\;sof-sdca-3amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=3,SDW_JACK=false,\
41-
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
42-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
43-
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
44-
45-
"cavs-sdw\;sof-sdca-4amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=4,SDW_JACK=false,\
46-
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
47-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
48-
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
28+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
4929

5030
"cavs-sdw\;sof-sdca-mic-id4\;SDW_JACK=false,SDW_DMIC=1,NUM_HDMIS=0,\
5131
SDW_DMIC_STREAM=Capture-SmartMic"

0 commit comments

Comments
 (0)