From 6e406768e0f31fe417ea4bcbfb2d0e1aff4734fc Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Fri, 20 Feb 2026 11:00:05 +0200 Subject: [PATCH] Revert "topology2: tplg-targets-sdca-generic: add echo ref to jack and amp" This reverts commit 96ab79a0af4970711ba045f23686a98310661662. 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 --- .../tplg-targets-sdca-generic.cmake | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/tools/topology/topology2/production/tplg-targets-sdca-generic.cmake b/tools/topology/topology2/production/tplg-targets-sdca-generic.cmake index a082c92c6574..fe393b3d2769 100644 --- a/tools/topology/topology2/production/tplg-targets-sdca-generic.cmake +++ b/tools/topology/topology2/production/tplg-targets-sdca-generic.cmake @@ -9,43 +9,23 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" # Split topologies "cavs-sdw\;sof-sdca-jack-id0\;SDW_JACK_OUT_STREAM=Playback-SimpleJack,\ -SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0,SDW_ECHO_REF_DAI=true,SDW_JACK_ECHO_REF=true" +SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0" "cavs-sdw\;sof-sdca-1amp-id2\;NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\ -DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true" +DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true" "cavs-sdw\;sof-sdca-2amp-id2\;NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\ -DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true" +DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true" "cavs-sdw\;sof-sdca-3amp-id2\;NUM_SDW_AMP_LINKS=3,SDW_JACK=false,\ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\ -DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true" +DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true" "cavs-sdw\;sof-sdca-4amp-id2\;NUM_SDW_AMP_LINKS=4,SDW_JACK=false,\ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\ -DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true" - -"cavs-sdw\;sof-sdca-1amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\ -SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\ -DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\ -JACK_RATE=48000,SDW_SPK_ECHO_REF=true" - -"cavs-sdw\;sof-sdca-2amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\ -SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\ -DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\ -JACK_RATE=48000,SDW_SPK_ECHO_REF=true" - -"cavs-sdw\;sof-sdca-3amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=3,SDW_JACK=false,\ -SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\ -DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\ -JACK_RATE=48000,SDW_SPK_ECHO_REF=true" - -"cavs-sdw\;sof-sdca-4amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=4,SDW_JACK=false,\ -SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\ -DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\ -JACK_RATE=48000,SDW_SPK_ECHO_REF=true" +DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true" "cavs-sdw\;sof-sdca-mic-id4\;SDW_JACK=false,SDW_DMIC=1,NUM_HDMIS=0,\ SDW_DMIC_STREAM=Capture-SmartMic"