diff --git a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf index 779f020fe740..00e7a5a0bde1 100644 --- a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf +++ b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf @@ -80,10 +80,9 @@ Object.Pipeline { } ] - passthrough-be [ + passthrough-capture-be [ { index 4 - direction capture Object.Widget.copier."1" { dai_type "HDA" diff --git a/tools/topology/topology2/cavs-nocodec-bt.conf b/tools/topology/topology2/cavs-nocodec-bt.conf index 709373e3adc4..d15cccde1955 100644 --- a/tools/topology/topology2/cavs-nocodec-bt.conf +++ b/tools/topology/topology2/cavs-nocodec-bt.conf @@ -12,7 +12,7 @@ - + @@ -113,10 +113,9 @@ Object.Dai.SSP [ # Pipeline ID:1 PCM ID: 0 Object.Pipeline { # playback pipelines - passthrough-be [ + passthrough-playback-be [ { index 2 - direction playback Object.Widget.pipeline.1 { stream_name 'NoCodec-0' } @@ -131,7 +130,6 @@ Object.Pipeline { } { index 4 - direction playback Object.Widget.pipeline.1 { stream_name 'NoCodec-1' } @@ -192,7 +190,6 @@ Object.Pipeline { passthrough-capture-be [ { index 6 - direction capture Object.Widget.pipeline.1 { stream_name 'NoCodec-0' } @@ -215,7 +212,6 @@ Object.Pipeline { } { index 10 - direction capture Object.Widget.pipeline.1 { stream_name 'NoCodec-1' } diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf index 153078e475fe..bbb867e44f7e 100644 --- a/tools/topology/topology2/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs-nocodec.conf @@ -436,7 +436,6 @@ Object.Pipeline.passthrough-capture [ Object.Pipeline.passthrough-capture-be [ { index 10 - direction capture Object.Widget.copier."1" { dai_index 1 @@ -456,7 +455,6 @@ Object.Pipeline.passthrough-capture-be [ } { index 12 - direction capture Object.Widget.copier."1" { dai_index 2 diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf index c786fbc284e6..f46909278e3b 100644 --- a/tools/topology/topology2/cavs-rt5682.conf +++ b/tools/topology/topology2/cavs-rt5682.conf @@ -12,7 +12,7 @@ - + @@ -261,7 +261,6 @@ Object.Pipeline { passthrough-capture-be [ { index 6 - direction capture Object.Widget.copier."1" { dai_index $HEADSET_SSP_DAI_INDEX diff --git a/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf b/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf index 50a9f9b15d6f..74cf2f3c9f1f 100644 --- a/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf +++ b/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf @@ -123,7 +123,6 @@ Object.Pipeline { passthrough-capture-be [ { - direction "capture" index 3 copier_type "ALH" Object.Widget.copier.1 { diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index 8b4e8912602d..eaa27d133fdc 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -17,7 +17,7 @@ - + diff --git a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf index aa8ceaf1fb8a..2319610dd82b 100644 --- a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf +++ b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf @@ -73,10 +73,9 @@ Object.Pipeline { } ] - passthrough-be [ + passthrough-capture-be [ { index 4 - direction capture Object.Widget.copier."1" { dai_type "HDA" diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf index 7e0e78b1960f..ca7219f843b6 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf @@ -47,7 +47,7 @@ Class.Pipeline."dai-copier-eqiir-module-copier-capture" { Object.Widget { copier."1" { - type dai_out + type dai_in period_sink_count 2 period_source_count 0 num_audio_formats 1 diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf index ffab590b3fe0..c346e9b0229b 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf @@ -46,7 +46,7 @@ Class.Pipeline."dai-copier-gain-mixin-capture" { Object.Widget { copier."1" { - type dai_out + type dai_in period_sink_count 2 period_source_count 0 node_type $HDA_LINK_INPUT_CLASS diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf index 43501d992280..9d12f92cd588 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf @@ -46,7 +46,7 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" { Object.Widget { copier."1" { - type dai_out + type dai_in period_sink_count 2 period_source_count 0 num_audio_formats 1 diff --git a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf index 9d5dd465b501..97ba11bc4804 100644 --- a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf @@ -49,6 +49,7 @@ Class.Pipeline."deepbuffer-playback" { copier_type "host" type "aif_in" node_type $HDA_HOST_OUTPUT_CLASS + num_audio_formats 3 num_input_audio_formats 3 num_output_audio_formats 3 @@ -67,7 +68,7 @@ Class.Pipeline."deepbuffer-playback" { out_bit_depth 32 out_valid_bit_depth 32 # 100ms buffer - dma_buffer_size "$[$obs * $DEEPBUFFER_FW_DMA_MS]" + dma_buffer_size "$[$ibs * $DEEPBUFFER_FW_DMA_MS]" } # 32-bit 48KHz 2ch Object.Base.audio_format.3 { diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf b/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf index 277c530ebd7e..f5cd5be2d977 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf @@ -48,6 +48,8 @@ Class.Pipeline."gain-capture" { copier."1" { copier_type "host" type "aif_out" + node_type $HDA_HOST_INPUT_CLASS + num_audio_formats 3 num_input_audio_formats 3 num_output_audio_formats 3 @@ -73,7 +75,6 @@ Class.Pipeline."gain-capture" { out_valid_bit_depth 32 dma_buffer_size "$[$obs * 2]" } - node_type $HDA_HOST_INPUT_CLASS } gain."1" { diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf index 960fa8f295fe..4b4d2889bae2 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf @@ -48,6 +48,8 @@ Class.Pipeline."gain-copier-capture" { copier."1" { copier_type "host" type "aif_out" + node_type $HDA_HOST_INPUT_CLASS + num_audio_formats 3 num_input_audio_formats 3 num_output_audio_formats 3 @@ -74,7 +76,6 @@ Class.Pipeline."gain-copier-capture" { out_valid_bit_depth 32 dma_buffer_size "$[$obs * 2]" } - node_type $HDA_HOST_INPUT_CLASS } gain."1" { diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf b/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf index e30393a214af..9b206e0de0ac 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf @@ -47,6 +47,8 @@ Class.Pipeline."gain-playback" { copier."1" { copier_type "host" type "aif_in" + node_type $HDA_HOST_OUTPUT_CLASS + num_audio_formats 3 num_input_audio_formats 3 num_output_audio_formats 3 @@ -72,7 +74,6 @@ Class.Pipeline."gain-playback" { out_valid_bit_depth 32 dma_buffer_size "$[$ibs * 2]" } - node_type $HDA_HOST_OUTPUT_CLASS } gain."1" { diff --git a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf index fe65d995ab79..3b5fe4584acc 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf @@ -49,6 +49,7 @@ Class.Pipeline."host-copier-gain-mixin-playback" { copier_type "host" type "aif_in" node_type $HDA_HOST_OUTPUT_CLASS + num_audio_formats 3 num_input_audio_formats 3 num_output_audio_formats 3 diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf index 48a9d62938c2..c73a074f3bf3 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf @@ -47,7 +47,7 @@ Class.Pipeline."mixout-gain-dai-copier-playback" { Object.Widget { mixout."1" {} copier."1" { - type dai_in + type dai_out node_type $HDA_LINK_OUTPUT_CLASS period_sink_count 0 period_source_count 2 diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf index 56edd1a02667..edf8b44a454d 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf @@ -51,7 +51,7 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" { Object.Widget { mixout."1" {} copier."1" { - type dai_in + type dai_out node_type $HDA_LINK_OUTPUT_CLASS period_sink_count 0 period_source_count 2 diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf index a5ea844ebb9e..3ab6caa53ff2 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf @@ -51,6 +51,7 @@ Class.Pipeline."mixout-gain-host-copier-capture" { copier_type "host" type "aif_out" node_type $HDA_HOST_INPUT_CLASS + num_audio_formats 4 num_input_audio_formats 4 num_output_audio_formats 4 diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf index f2ca4c03005c..8ab25b3c412a 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf @@ -46,7 +46,7 @@ Class.Pipeline."mixout-gain-smart-amp-dai-copier-playback" { Object.Widget { mixout."1" {} copier."1" { - type dai_in + type dai_out node_type $HDA_LINK_OUTPUT_CLASS num_audio_formats 2 num_input_audio_formats 2 diff --git a/tools/topology/topology2/include/pipelines/cavs/passthrough-capture-be.conf b/tools/topology/topology2/include/pipelines/cavs/passthrough-capture-be.conf index 167d49f77e79..4372c06b23c8 100644 --- a/tools/topology/topology2/include/pipelines/cavs/passthrough-capture-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/passthrough-capture-be.conf @@ -2,11 +2,11 @@ # BE DAI passthrough pipeline for capture # # All attributes defined herein are namespaced by alsatplg to -# "Object.Pipeline.passthrough-be-capture.N.attribute_name" +# "Object.Pipeline.passthrough-capture-be.N.attribute_name" # -# Usage: mixin-playback pipeline object can be instantiated as: +# Usage: passthrough-capture-be pipeline object can be instantiated as: # -# Object.Pipeline.dai-pipeline."N" { +# Object.Pipeline.passthrough-capture-be."N" { # direction "capture" # period 1000 # time_domain "timer" @@ -32,6 +32,10 @@ Class.Pipeline."passthrough-capture-be" { "index" ] + !immutable [ + "direction" + ] + unique "instance" } @@ -57,6 +61,7 @@ Class.Pipeline."passthrough-capture-be" { } } + direction "capture" time_domain "timer" dynamic_pipeline 1 channels 2 diff --git a/tools/topology/topology2/include/pipelines/cavs/passthrough-capture.conf b/tools/topology/topology2/include/pipelines/cavs/passthrough-capture.conf index c830ec8b9778..1bc4ceef5d33 100644 --- a/tools/topology/topology2/include/pipelines/cavs/passthrough-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/passthrough-capture.conf @@ -16,9 +16,9 @@ # Where N is the unique pipeline ID within the same alsaconf node. # - + Class.Pipeline."passthrough-capture" { @@ -47,6 +47,7 @@ Class.Pipeline."passthrough-capture" { copier_type "host" type "aif_out" node_type $HDA_HOST_INPUT_CLASS + num_audio_formats 6 num_input_audio_formats 6 num_output_audio_formats 6 diff --git a/tools/topology/topology2/include/pipelines/cavs/passthrough-be.conf b/tools/topology/topology2/include/pipelines/cavs/passthrough-playback-be.conf similarity index 81% rename from tools/topology/topology2/include/pipelines/cavs/passthrough-be.conf rename to tools/topology/topology2/include/pipelines/cavs/passthrough-playback-be.conf index 140c62049230..0c074f594497 100644 --- a/tools/topology/topology2/include/pipelines/cavs/passthrough-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/passthrough-playback-be.conf @@ -2,11 +2,11 @@ # BE DAI passthrough pipeline # # All attributes defined herein are namespaced by alsatplg to -# "Object.Pipeline.passthrough-be.N.attribute_name" +# "Object.Pipeline.passthrough-playback-be.N.attribute_name" # -# Usage: mixin-playback pipeline object can be instantiated as: +# Usage: passthrough-playback-be pipeline object can be instantiated as: # -# Object.Pipeline.dai-pipeline."N" { +# Object.Pipeline.passthrough-playback-be."N" { # direction "playback" # period 1000 # time_domain "timer" @@ -21,7 +21,7 @@ -Class.Pipeline."passthrough-be" { +Class.Pipeline."passthrough-playback-be" { DefineAttribute."index" {} @@ -32,17 +32,16 @@ Class.Pipeline."passthrough-be" { "index" ] - # - # mixin-playback objects instantiated within the same alsaconf node must have - # unique pipeline_id attribute - # + !immutable [ + "direction" + ] + unique "instance" } Object.Widget { copier."1" { - type dai_in - node_type $HDA_LINK_OUTPUT_CLASS + type dai_out num_audio_formats 3 num_input_audio_formats 3 num_output_audio_formats 3 @@ -84,6 +83,7 @@ Class.Pipeline."passthrough-be" { } } + direction "playback" time_domain "timer" dynamic_pipeline 1 channels 2 diff --git a/tools/topology/topology2/include/pipelines/cavs/passthrough-playback.conf b/tools/topology/topology2/include/pipelines/cavs/passthrough-playback.conf index c11d84116527..6f17f2b4df56 100644 --- a/tools/topology/topology2/include/pipelines/cavs/passthrough-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/passthrough-playback.conf @@ -45,8 +45,9 @@ Class.Pipeline."passthrough-playback" { Object.Widget { copier."1" { copier_type "host" - node_type $HDA_HOST_OUTPUT_CLASS type "aif_in" + node_type $HDA_HOST_OUTPUT_CLASS + num_audio_formats 3 num_input_audio_formats 3 num_output_audio_formats 3 @@ -62,7 +63,7 @@ Class.Pipeline."passthrough-playback" { in_valid_bit_depth 24 out_bit_depth 32 out_valid_bit_depth 32 - dma_buffer_size "$[$obs * 2]" + dma_buffer_size "$[$ibs * 2]" } # 32-bit 48KHz 2ch Object.Base.audio_format.3 { diff --git a/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf index 0b97299ba444..39c9d11f7d3d 100644 --- a/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf @@ -45,10 +45,9 @@ Class.Pipeline."src-gain-mixin-playback" { copier."1" { copier_type "host" type "aif_in" + node_type $HDA_HOST_OUTPUT_CLASS - - node_type $HDA_HOST_OUTPUT_CLASS } src."1" { diff --git a/tools/topology/topology2/platform/intel/bt-generic.conf b/tools/topology/topology2/platform/intel/bt-generic.conf index 6e5fc8649302..fc702a5c1128 100644 --- a/tools/topology/topology2/platform/intel/bt-generic.conf +++ b/tools/topology/topology2/platform/intel/bt-generic.conf @@ -8,10 +8,10 @@ IncludeByKey.BT_LOOPBACK_MODE { Object.Pipeline { # playback pipelines - passthrough-be [ + passthrough-playback-be [ { index $BT_PB_DAI_PIPELINE_ID - direction playback + Object.Widget.pipeline.1 { stream_name $BT_PB_PIPELINE_STREAM_NAME } @@ -78,7 +78,7 @@ Object.Pipeline { out_valid_bit_depth 16 in_channels 2 out_channels 2 - dma_buffer_size "$[$obs * 2]" + dma_buffer_size "$[$ibs * 2]" } Object.Base.audio_format.2 { in_bit_depth 16 @@ -89,7 +89,7 @@ Object.Pipeline { out_channels 1 in_rate 8000 out_rate 8000 - dma_buffer_size "$[$obs * 2]" + dma_buffer_size "$[$ibs * 2]" } Object.Base.audio_format.3 { in_bit_depth 16 @@ -100,7 +100,7 @@ Object.Pipeline { out_channels 1 in_rate 16000 out_rate 16000 - dma_buffer_size "$[$obs * 2]" + dma_buffer_size "$[$ibs * 2]" } } } @@ -156,7 +156,7 @@ Object.Pipeline { passthrough-capture-be [ { index $BT_CP_DAI_PIPELINE_ID - direction "capture" + Object.Widget.pipeline.1 { stream_name $BT_CP_PIPELINE_STREAM_NAME } @@ -178,7 +178,7 @@ Object.Pipeline { out_valid_bit_depth 16 in_channels 2 out_channels 2 - dma_buffer_size "$[$obs * 2]" + dma_buffer_size "$[$ibs * 2]" } Object.Base.audio_format.1 { in_bit_depth 16 @@ -189,7 +189,7 @@ Object.Pipeline { out_channels 1 in_rate 8000 out_rate 8000 - dma_buffer_size "$[$obs * 2]" + dma_buffer_size "$[$ibs * 2]" } Object.Base.audio_format.2 { in_bit_depth 16 @@ -200,7 +200,7 @@ Object.Pipeline { out_channels 1 in_rate 16000 out_rate 16000 - dma_buffer_size "$[$obs * 2]" + dma_buffer_size "$[$ibs * 2]" } } } diff --git a/tools/topology/topology2/platform/intel/hdmi-generic.conf b/tools/topology/topology2/platform/intel/hdmi-generic.conf index d8d60879e93e..6e6939d0b9bc 100644 --- a/tools/topology/topology2/platform/intel/hdmi-generic.conf +++ b/tools/topology/topology2/platform/intel/hdmi-generic.conf @@ -58,9 +58,8 @@ Object.Pipeline { use_chain_dma $USE_CHAIN_DMA } ] - passthrough-be [ + passthrough-playback-be [ { - direction "playback" index $HDMI1_DAI_PIPELINE_ID Object.Widget.copier.1 { @@ -71,7 +70,6 @@ Object.Pipeline { use_chain_dma $USE_CHAIN_DMA } { - direction "playback" index $HDMI2_DAI_PIPELINE_ID Object.Widget.copier.1 { @@ -82,7 +80,6 @@ Object.Pipeline { use_chain_dma $USE_CHAIN_DMA } { - direction "playback" index $HDMI3_DAI_PIPELINE_ID Object.Widget.copier.1 { stream_name 'iDisp3' @@ -167,9 +164,8 @@ IncludeByKey.NUM_HDMIS { direction playback } ] - Object.Pipeline.passthrough-be [ + Object.Pipeline.passthrough-playback-be [ { - direction "playback" index $HDMI4_DAI_PIPELINE_ID Object.Widget.copier.1 { diff --git a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf index 087d8d754243..98c6b5f8dfd2 100644 --- a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf +++ b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf @@ -71,9 +71,8 @@ IncludeByKey.NUM_SDW_AMPS { } Object.Pipeline { - passthrough-be [ + passthrough-playback-be [ { - direction "playback" index $ALH_2ND_SPK_ID copier_type "ALH" Object.Widget.copier.1 { @@ -87,7 +86,6 @@ IncludeByKey.NUM_SDW_AMPS { ] passthrough-capture-be [ { - direction "capture" index $ALH_2ND_SPK_IN_ID copier_type "ALH" @@ -163,9 +161,8 @@ IncludeByKey.SDW_AMP_FEEDBACK { } ] - passthrough-be [ + passthrough-capture-be [ { - direction "capture" index 31 copier_type "ALH" diff --git a/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf b/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf index c93ca4cbad19..0a8a0cc70480 100644 --- a/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf +++ b/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf @@ -37,7 +37,6 @@ Object.Pipeline { ] passthrough-capture-be [ { - direction "capture" index 41 copier_type "ALH" Object.Widget.copier.1 { diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf index 074510e61ec1..5321781b573e 100644 --- a/tools/topology/topology2/sof-hda-generic.conf +++ b/tools/topology/topology2/sof-hda-generic.conf @@ -19,7 +19,7 @@ - +