diff --git a/tools/topology/topology2/platform/intel/sdw-amp-echo-ref.conf b/tools/topology/topology2/platform/intel/sdw-amp-echo-ref.conf index abde20519f2e..8a00d8d43516 100644 --- a/tools/topology/topology2/platform/intel/sdw-amp-echo-ref.conf +++ b/tools/topology/topology2/platform/intel/sdw-amp-echo-ref.conf @@ -34,11 +34,19 @@ IncludeByKey.SDW_SPK_ECHO_REF { } ] - Object.Base.route [ - { - source "alh-copier.Loopback_Virtual.25" - sink "siggen.$SDW_SPK_ECHO_REF_PIPELINE_ID.1" + # the loopback DAI copier is only defined with SDW_ECHO_REF_DAI + IncludeByKey.SDW_ECHO_REF_DAI { + "true" { + Object.Base.route [ + { + source "alh-copier.Loopback_Virtual.25" + sink "siggen.$SDW_SPK_ECHO_REF_PIPELINE_ID.1" + } + ] } + } + + Object.Base.route [ { source "module-copier.21.22" sink "siggen.$SDW_SPK_ECHO_REF_PIPELINE_ID.1" diff --git a/tools/topology/topology2/platform/intel/sdw-jack-echo-ref.conf b/tools/topology/topology2/platform/intel/sdw-jack-echo-ref.conf index fa506c6b2d46..3d8ef9b7f579 100644 --- a/tools/topology/topology2/platform/intel/sdw-jack-echo-ref.conf +++ b/tools/topology/topology2/platform/intel/sdw-jack-echo-ref.conf @@ -90,11 +90,19 @@ IncludeByKey.SDW_JACK_ECHO_REF { } ] - Object.Base.route [ - { - source "alh-copier.Loopback_Virtual.25" - sink "siggen.$SDW_JACK_ECHO_REF_PIPELINE_ID.1" + # the loopback DAI copier is only defined with SDW_ECHO_REF_DAI + IncludeByKey.SDW_ECHO_REF_DAI { + "true" { + Object.Base.route [ + { + source "alh-copier.Loopback_Virtual.25" + sink "siggen.$SDW_JACK_ECHO_REF_PIPELINE_ID.1" + } + ] } + } + + Object.Base.route [ { source "module-copier.1.12" sink "siggen.$SDW_JACK_ECHO_REF_PIPELINE_ID.1"