diff --git a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf index 4a7be279a466..6b39c1e42c0d 100644 --- a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf +++ b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf @@ -1,7 +1,7 @@ Define { ANALOG_PLAYBACK_PCM 'Analog Playback' ANALOG_CAPTURE_PCM 'Analog Capture' - HDA_ANALOG_DAI_NAME 'Analog Playback and Capture' + HDA_ANALOG_DAI_NAME 'Analog' DEEP_BUFFER_PIPELINE_ID 15 DEEP_BUFFER_PCM_ID 31 DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1' @@ -32,7 +32,7 @@ Object.Pipeline { { index 2 - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { node_type $HDA_LINK_OUTPUT_CLASS stream_name $HDA_ANALOG_DAI_NAME dai_type "HDA" @@ -88,12 +88,13 @@ Object.Pipeline { index 4 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_type "HDA" type "dai_out" copier_type "HDA" stream_name $HDA_ANALOG_DAI_NAME node_type $HDA_LINK_INPUT_CLASS + num_output_pins 1 Object.Base.audio_format.1 { in_bit_depth 32 in_valid_bit_depth 32 @@ -128,7 +129,7 @@ Object.PCM.pcm [ # top-level pipeline connections Object.Base.route [ { - sink 'copier.HDA.2.1' + sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' source 'eqfir.2.1' } { @@ -136,7 +137,7 @@ Object.Base.route [ sink 'mixout.2.1' } { - source 'copier.HDA.4.1' + source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' sink 'host-copier.0.capture' } { diff --git a/tools/topology/topology2/cavs-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-hda.conf index 2e5ec99d5477..7ec84fc80c8e 100644 --- a/tools/topology/topology2/cavs-mixin-mixout-hda.conf +++ b/tools/topology/topology2/cavs-mixin-mixout-hda.conf @@ -1,7 +1,7 @@ Define { ANALOG_PLAYBACK_PCM 'Analog Playback' ANALOG_CAPTURE_PCM 'Analog Capture' - HDA_ANALOG_DAI_NAME 'Analog Playback and Capture' + HDA_ANALOG_DAI_NAME 'Analog' DEEP_BUFFER_PIPELINE_ID 15 DEEP_BUFFER_PCM_ID 31 DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1' @@ -32,7 +32,7 @@ Object.Pipeline { { index 2 - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { node_type $HDA_LINK_OUTPUT_CLASS stream_name $HDA_ANALOG_DAI_NAME dai_type "HDA" @@ -78,7 +78,7 @@ Object.Pipeline { index 4 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_type "HDA" type "dai_out" copier_type "HDA" @@ -123,7 +123,7 @@ Object.PCM.pcm [ # top-level pipeline connections Object.Base.route [ { - sink 'copier.HDA.2.1' + sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' source 'gain.2.1' } { @@ -131,7 +131,7 @@ Object.Base.route [ sink 'mixout.2.1' } { - source 'copier.HDA.4.1' + source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' sink 'eqiir.4.1' } { diff --git a/tools/topology/topology2/cavs-nocodec-bt.conf b/tools/topology/topology2/cavs-nocodec-bt.conf index f027fd97f4e9..ad478fbd1c5e 100644 --- a/tools/topology/topology2/cavs-nocodec-bt.conf +++ b/tools/topology/topology2/cavs-nocodec-bt.conf @@ -25,7 +25,7 @@ - + @@ -41,11 +41,11 @@ Define { DMIC0_HOST_PIPELINE_ID 13 DMIC0_DAI_PIPELINE_ID 14 DMIC0_HOST_PIPELINE_SINK 'copier.host.13.1' - DMIC0_DAI_PIPELINE_SRC 'copier.DMIC.14.1' + DMIC0_DAI_PIPELINE_SRC 'dai-copier.DMIC.NoCodec-6.capture' DMIC0_NAME 'NoCodec-6' DMIC1_NAME 'NoCodec-7' DMIC0_PCM_CAPS 'Passthrough Capture 13' - DMIC0_PIPELINE_STREAM_NAME 'copier.DMIC.14.1' + DMIC0_PIPELINE_STREAM_NAME 'dai-copier.DMIC.14.1' # override BT configuration BT_NAME "NoCodec-2" @@ -130,12 +130,13 @@ Object.Pipeline { stream_name 'NoCodec-0' } - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index 0 dai_type "SSP" copier_type "SSP" stream_name "NoCodec-0" node_type $I2S_LINK_OUTPUT_CLASS + num_input_pins 1 } } { @@ -145,12 +146,13 @@ Object.Pipeline { stream_name 'NoCodec-1' } - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index 1 dai_type "SSP" copier_type "SSP" stream_name "NoCodec-1" node_type $I2S_LINK_OUTPUT_CLASS + num_input_pins 1 } } ] @@ -210,7 +212,7 @@ Object.Pipeline { stream_name 'NoCodec-0' } - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index 0 dai_type "SSP" type dai_out @@ -232,7 +234,7 @@ Object.Pipeline { stream_name 'NoCodec-1' } - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index 1 dai_type "SSP" type dai_out @@ -296,18 +298,18 @@ Object.PCM.pcm [ Object.Base.route [ { source "host-copier.0.playback" - sink "copier.SSP.2.1" + sink "dai-copier.SSP.NoCodec-0.playback" } { source "host-copier.1.playback" - sink "copier.SSP.4.1" + sink "dai-copier.SSP.NoCodec-1.playback" } { - source "copier.SSP.6.1" + source "dai-copier.SSP.NoCodec-0.capture" sink "host-copier.0.capture" } { - source "copier.SSP.10.1" + source "dai-copier.SSP.NoCodec-1.capture" sink "host-copier.1.capture" } ] diff --git a/tools/topology/topology2/cavs-nocodec-multicore.conf b/tools/topology/topology2/cavs-nocodec-multicore.conf index 581126d0c1e6..ae980567082e 100644 --- a/tools/topology/topology2/cavs-nocodec-multicore.conf +++ b/tools/topology/topology2/cavs-nocodec-multicore.conf @@ -29,7 +29,7 @@ - + @@ -158,7 +158,7 @@ Object.Pipeline.mixout-gain-dai-copier-playback [ index 14 core $SSP0_CORE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { core_id $SSP0_CORE_ID dai_index 0 dai_type "SSP" @@ -178,7 +178,7 @@ Object.Pipeline.mixout-gain-dai-copier-playback [ index 6 core $SSP2_CORE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { core_id $SSP2_CORE_ID dai_index 2 dai_type "SSP" @@ -223,7 +223,7 @@ Object.Pipeline.io-gateway-capture [ index 8 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index 1 dai_type "SSP" type dai_out @@ -242,7 +242,7 @@ Object.Pipeline.io-gateway-capture [ index 12 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index 2 dai_type "SSP" type dai_out @@ -305,7 +305,7 @@ Object.PCM.pcm [ Object.Base.route [ { source "gain.14.1" - sink "copier.SSP.14.1" + sink "dai-copier.SSP.NoCodec-0.playback" } { source "mixin.1.1" @@ -313,18 +313,18 @@ Object.Base.route [ } { source "gain.6.1" - sink "copier.SSP.6.1" + sink "dai-copier.SSP.NoCodec-2.playback" } { source "mixin.5.1" sink "mixout.6.1" } { - source "copier.SSP.8.1" + source "dai-copier.SSP.NoCodec-0.capture" sink "host-copier.0.capture" } { - source "copier.SSP.12.1" + source "dai-copier.SSP.NoCodec-2.capture" sink "host-copier.2.capture" } { @@ -392,7 +392,7 @@ IncludeByKey.SSP1_ENABLED { index 4 core $SSP1_CORE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { core_id $SSP1_CORE_ID dai_index 1 dai_type "SSP" @@ -429,7 +429,7 @@ IncludeByKey.SSP1_ENABLED { index 10 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index 1 dai_type "SSP" type dai_out @@ -476,10 +476,10 @@ IncludeByKey.SSP1_ENABLED { } { source "gain.4.1" - sink "copier.SSP.4.1" + sink "dai-copier.SSP.NoCodec-1.playback" } { - source "copier.SSP.10.1" + source "dai-copier.SSP.NoCodec-1.capture" sink "host-copier.1.capture" } { diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf index ffea7326a076..c72ff3b2b9cb 100644 --- a/tools/topology/topology2/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs-nocodec.conf @@ -37,7 +37,7 @@ - + @@ -57,7 +57,7 @@ Define { DMIC0_DAI_PIPELINE_ID 14 DMIC0_HOST_PIPELINE_SINK 'gain.13.1' DMIC0_DAI_PIPELINE_SRC 'module-copier.14.2' - DMIC0_DAI_COPIER 'copier.DMIC.14.1' + DMIC0_DAI_COPIER 'dai-copier.DMIC.NoCodec-6.capture' DMIC0_DAI_GAIN 'eqiir.14.1' DMIC0_NAME 'NoCodec-6' DMIC1_NAME 'NoCodec-7' @@ -209,7 +209,7 @@ IncludeByKey.PASSTHROUGH { { index 2 - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index 0 dai_type "SSP" copier_type "SSP" @@ -230,7 +230,7 @@ IncludeByKey.PASSTHROUGH { } Object.Base.input_pin_binding.2 { - input_pin_binding_name "copier.SSP.8.1" + input_pin_binding_name "dai-copier.SSP.NoCodec-0.capture" } Object.Control.bytes."1" { @@ -244,7 +244,7 @@ IncludeByKey.PASSTHROUGH { { index 6 - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index 2 dai_type "SSP" copier_type "SSP" @@ -351,7 +351,7 @@ IncludeByKey.PASSTHROUGH { Object.Pipeline.dai-copier-gain-module-copier-capture [ { index 8 - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index 0 dai_type "SSP" type dai_out @@ -397,12 +397,13 @@ IncludeByKey.PASSTHROUGH { index 2 direction playback - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index 0 dai_type "SSP" copier_type "SSP" stream_name "NoCodec-0" node_type $I2S_LINK_OUTPUT_CLASS + num_input_pins 1 num_input_audio_formats 3 Object.Base.input_audio_format [ { @@ -439,12 +440,13 @@ IncludeByKey.PASSTHROUGH { index 6 direction playback - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index 2 dai_type "SSP" copier_type "SSP" stream_name "NoCodec-2" node_type $I2S_LINK_OUTPUT_CLASS + num_input_pins 1 num_input_audio_formats 3 Object.Base.input_audio_format [ { @@ -572,14 +574,16 @@ IncludeByKey.PASSTHROUGH { index 8 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index 0 dai_type "SSP" type dai_out copier_type "SSP" stream_name "NoCodec-0" node_type $I2S_LINK_INPUT_CLASS + num_output_pins 2 num_input_audio_formats 1 + Object.Base.input_audio_format [ { in_bit_depth 32 @@ -615,7 +619,7 @@ Object.Pipeline.io-gateway-capture [ index 12 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index 2 dai_type "SSP" type dai_out @@ -843,7 +847,7 @@ IncludeByKey.PASSTHROUGH { Object.Base.route [ { - source "copier.SSP.12.1" + source "dai-copier.SSP.NoCodec-2.capture" sink "host-copier.2.capture" } ] @@ -853,18 +857,18 @@ IncludeByKey.PASSTHROUGH { Object.Base.route [ { source "smart_amp.2.1" - sink "copier.SSP.2.1" + sink "dai-copier.SSP.NoCodec-0.playback" } { source "gain.6.1" - sink "copier.SSP.6.1" + sink "dai-copier.SSP.NoCodec-2.playback" } { source "mixin.5.1" sink "mixout.6.1" } { - source "copier.SSP.8.1" + source "dai-copier.SSP.NoCodec-0.capture" sink "gain.8.1" } { @@ -888,7 +892,7 @@ IncludeByKey.PASSTHROUGH { sink gain.20.1 } { - source "copier.SSP.8.1" + source "dai-copier.SSP.NoCodec-0.capture" sink "smart_amp.2.1" } { @@ -920,16 +924,16 @@ IncludeByKey.PASSTHROUGH { "true" { Object.Base.route [ { - source "copier.SSP.8.1" + source "dai-copier.SSP.NoCodec-0.capture" sink "host-copier.0.capture" } { source "host-copier.0.playback" - sink "copier.SSP.2.1" + sink "dai-copier.SSP.NoCodec-0.playback" } { source "host-copier.2.playback" - sink "copier.SSP.6.1" + sink "dai-copier.SSP.NoCodec-2.playback" } ] } @@ -984,7 +988,7 @@ IncludeByKey.SSP1_ENABLED { index 10 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index 1 dai_type "SSP" type dai_out @@ -1034,7 +1038,7 @@ IncludeByKey.SSP1_ENABLED { { index 4 - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index 1 dai_type "SSP" copier_type "SSP" @@ -1056,8 +1060,8 @@ IncludeByKey.SSP1_ENABLED { index 4 direction playback - Object.Widget.copier.1 { - dai_index 0 + Object.Widget.dai-copier.1 { + dai_index 1 dai_type "SSP" copier_type "SSP" stream_name "NoCodec-1" @@ -1169,7 +1173,7 @@ IncludeByKey.SSP1_ENABLED { } { source "gain.4.1" - sink "copier.SSP.4.1" + sink "dai-copier.SSP.NoCodec-1.playback" } { source 'host-copier.1.playback' @@ -1181,14 +1185,14 @@ IncludeByKey.SSP1_ENABLED { Object.Base.route [ { source "host-copier.1.playback" - sink "copier.SSP.4.1" + sink "dai-copier.SSP.NoCodec-1.playback" } ] } } Object.Base.route [ { - source "copier.SSP.10.1" + source "dai-copier.SSP.NoCodec-1.capture" sink "host-copier.1.capture" } ] diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf index 970a8d742436..95f3cf5a7f5f 100644 --- a/tools/topology/topology2/cavs-rt5682.conf +++ b/tools/topology/topology2/cavs-rt5682.conf @@ -34,7 +34,7 @@ - + @@ -58,7 +58,7 @@ Define { DMIC0_DAI_PIPELINE_ID 14 DMIC0_HOST_PIPELINE_SINK 'gain.13.1' DMIC0_DAI_PIPELINE_SRC 'module-copier.14.2' - DMIC0_DAI_COPIER 'copier.DMIC.14.1' + DMIC0_DAI_COPIER 'dai-copier.DMIC.dmic01.capture' DMIC0_DAI_GAIN 'eqiir.14.1' DMIC0_NAME 'dmic01' DMIC0_PCM_CAPS 'Gain Capture 13' @@ -88,15 +88,12 @@ Define { INCLUDE_ECHO_REF false ECHO_REF_HOST_PIPELINE_ID 7 ECHO_REF_DAI_PIPELINE_ID 8 - ECHO_REF_HOST_PIPELINE_SINK 'copier.host.7.1' - ECHO_REF_DAI_PIPELINE_SRC 'copier.SSP.8.1' ECHO_REF_COPIER_MODULE 'module-copier.8.2' # override BT default definitions BT_PB_HOST_PIPELINE_ID 9 BT_PB_DAI_PIPELINE_ID 10 - BT_PB_HOST_PIPELINE_SINK "copier.SSP.10.1" BT_PB_DAI_PIPELINE_SRC "copier.host.9.1" - BT_PB_PIPELINE_STREAM_NAME "copier.SSP.10.1" + BT_PB_PIPELINE_STREAM_NAME "dai-copier.SSP.10.1" GOOGLE_RTC_AEC_SUPPORT 0 GOOGLE_RTC_AEC_REF_SOURCE 'module-copier.8.2' } @@ -230,7 +227,7 @@ Object.Pipeline { { index 2 - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index $HEADSET_SSP_DAI_INDEX dai_type "SSP" copier_type "SSP" @@ -247,7 +244,7 @@ Object.Pipeline { { index 4 - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index $SPEAKER_SSP_DAI_INDEX dai_type "SSP" copier_type "SSP" @@ -279,7 +276,7 @@ Object.Pipeline { index 6 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index $HEADSET_SSP_DAI_INDEX dai_type "SSP" type dai_out @@ -336,7 +333,7 @@ Object.PCM.pcm [ Object.Base.route [ { source "gain.2.1" - sink "copier.SSP.2.1" + sink "dai-copier.SSP.$HEADSET_CODEC_NAME.playback" } { source "mixin.1.1" @@ -344,14 +341,14 @@ Object.Base.route [ } { source "gain.4.1" - sink "copier.SSP.4.1" + sink "dai-copier.SSP.$SPEAKER_CODEC_NAME.playback" } { source "mixin.3.1" sink "mixout.4.1" } { - source "copier.SSP.6.1" + source "dai-copier.SSP.$HEADSET_CODEC_NAME.capture" sink "host-copier.0.capture" } { diff --git a/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf b/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf index df6e1cc2517d..670e1e7b126b 100644 --- a/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf +++ b/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf @@ -23,7 +23,7 @@ - + diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index b8f1d4245f53..1aed5b441c82 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -32,7 +32,7 @@ - + @@ -54,7 +54,7 @@ Define { DMIC0_DAI_PIPELINE_ID 101 DMIC0_HOST_PIPELINE_SINK 'gain.100.1' DMIC0_DAI_PIPELINE_SRC 'module-copier.101.2' - DMIC0_DAI_COPIER 'copier.DMIC.101.1' + DMIC0_DAI_COPIER 'dai-copier.DMIC.dmic01.capture' DMIC0_DAI_GAIN 'eqiir.101.1' DMIC0_NAME 'dmic01' DMIC0_ID 4 diff --git a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf index bebca860f66d..854dfb4ea936 100644 --- a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf +++ b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf @@ -1,7 +1,7 @@ Define { ANALOG_PLAYBACK_PCM 'Analog Playback' ANALOG_CAPTURE_PCM 'Analog Capture' - HDA_ANALOG_DAI_NAME 'Analog Playback and Capture' + HDA_ANALOG_DAI_NAME 'Analog' DEEP_BUFFER_PIPELINE_ID 15 DEEP_BUFFER_PCM_ID 31 DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1' @@ -32,7 +32,7 @@ Object.Pipeline { { index 2 - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { node_type $HDA_LINK_OUTPUT_CLASS stream_name $HDA_ANALOG_DAI_NAME dai_type "HDA" @@ -81,12 +81,13 @@ Object.Pipeline { index 4 direction capture - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_type "HDA" type "dai_out" copier_type "HDA" stream_name $HDA_ANALOG_DAI_NAME node_type $HDA_LINK_INPUT_CLASS + num_output_pins 1 Object.Base.audio_format.1 { in_bit_depth 32 in_valid_bit_depth 32 @@ -123,7 +124,7 @@ Object.PCM.pcm [ # top-level pipeline connections Object.Base.route [ { - sink 'copier.HDA.2.1' + sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' source 'gain.2.1' } { @@ -131,7 +132,7 @@ Object.Base.route [ sink 'mixout.2.1' } { - source 'copier.HDA.4.1' + source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' sink 'host-copier.0.capture' } { diff --git a/tools/topology/topology2/include/common/audio_format.conf b/tools/topology/topology2/include/common/audio_format.conf index 71655c8eab3f..94e34ec50f79 100644 --- a/tools/topology/topology2/include/common/audio_format.conf +++ b/tools/topology/topology2/include/common/audio_format.conf @@ -22,25 +22,25 @@ Class.Base."audio_format" { # input sampling rate DefineAttribute."in_rate" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input bit depth DefineAttribute."in_bit_depth" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input valid bit depth DefineAttribute."in_valid_bit_depth" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input channel count DefineAttribute."in_channels" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { min 1 max 8 @@ -50,20 +50,20 @@ Class.Base."audio_format" { # input channel map DefineAttribute."in_ch_map" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input channel config DefineAttribute."in_ch_cfg" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input interleaving style DefineAttribute."in_interleaving_style" { type "string" # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { !valid_values [ "interleaved" @@ -79,20 +79,20 @@ Class.Base."audio_format" { # input format config DefineAttribute."in_fmt_cfg" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output sampling rate DefineAttribute."out_rate" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input sample_type DefineAttribute."in_sample_type" { type string # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { !valid_values [ $SAMPLE_TYPE_MSB_INTEGER @@ -107,19 +107,19 @@ Class.Base."audio_format" { # output bit depth DefineAttribute."out_bit_depth" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output valid bit depth DefineAttribute."out_valid_bit_depth" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output channel count DefineAttribute."out_channels" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { min 1 max 8 @@ -129,20 +129,20 @@ Class.Base."audio_format" { # output channel map DefineAttribute."out_ch_map" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output channel config DefineAttribute."out_ch_cfg" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output interleaving style DefineAttribute."out_interleaving_style" { type "string" # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { !valid_values [ "interleaved" @@ -158,7 +158,7 @@ Class.Base."audio_format" { # output format config DefineAttribute."out_fmt_cfg" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # @@ -166,7 +166,7 @@ Class.Base."audio_format" { # DefineAttribute."ibs" { # Token set reference name and type - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # @@ -174,14 +174,14 @@ Class.Base."audio_format" { # DefineAttribute."obs" { # Token set reference name and type - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } #output sample_type DefineAttribute."out_sample_type" { type string # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { !valid_values [ $SAMPLE_TYPE_MSB_INTEGER diff --git a/tools/topology/topology2/include/common/input_audio_format.conf b/tools/topology/topology2/include/common/input_audio_format.conf index c45f36505a27..6eb8b1e0204d 100644 --- a/tools/topology/topology2/include/common/input_audio_format.conf +++ b/tools/topology/topology2/include/common/input_audio_format.conf @@ -17,31 +17,31 @@ Class.Base."input_audio_format" { DefineAttribute."input_pin_index" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input sampling rate DefineAttribute."in_rate" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input bit depth DefineAttribute."in_bit_depth" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input valid bit depth DefineAttribute."in_valid_bit_depth" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input channel count DefineAttribute."in_channels" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { min 1 max 8 @@ -51,20 +51,20 @@ Class.Base."input_audio_format" { # input channel map DefineAttribute."in_ch_map" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input channel config DefineAttribute."in_ch_cfg" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input interleaving style DefineAttribute."in_interleaving_style" { type "string" # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { !valid_values [ "interleaved" @@ -80,14 +80,14 @@ Class.Base."input_audio_format" { # input format config DefineAttribute."in_fmt_cfg" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # input sample_type DefineAttribute."in_sample_type" { type string # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { !valid_values [ $SAMPLE_TYPE_MSB_INTEGER @@ -104,7 +104,7 @@ Class.Base."input_audio_format" { # DefineAttribute."ibs" { # Token set reference name and type - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } attributes { diff --git a/tools/topology/topology2/include/common/input_pin_binding.conf b/tools/topology/topology2/include/common/input_pin_binding.conf index 494340f19181..f72d81c2a7ea 100644 --- a/tools/topology/topology2/include/common/input_pin_binding.conf +++ b/tools/topology/topology2/include/common/input_pin_binding.conf @@ -17,7 +17,7 @@ Class.Base."input_pin_binding" { # The widget name that the intput pin should be bound with. DefineAttribute."input_pin_binding_name" { - token_ref "sof_tkn_comp.string" + token_ref "comp.string" } attributes { diff --git a/tools/topology/topology2/include/common/output_audio_format.conf b/tools/topology/topology2/include/common/output_audio_format.conf index c1779b191735..f67f8b7d2796 100644 --- a/tools/topology/topology2/include/common/output_audio_format.conf +++ b/tools/topology/topology2/include/common/output_audio_format.conf @@ -17,31 +17,31 @@ Class.Base."output_audio_format" { DefineAttribute."output_pin_index" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output sampling rate DefineAttribute."out_rate" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output bit depth DefineAttribute."out_bit_depth" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output valid bit depth DefineAttribute."out_valid_bit_depth" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output channel count DefineAttribute."out_channels" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { min 1 max 8 @@ -51,20 +51,20 @@ Class.Base."output_audio_format" { # output channel map DefineAttribute."out_ch_map" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output channel config DefineAttribute."out_ch_cfg" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # output interleaving style DefineAttribute."out_interleaving_style" { type "string" # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { !valid_values [ "interleaved" @@ -80,7 +80,7 @@ Class.Base."output_audio_format" { # output format config DefineAttribute."out_fmt_cfg" { # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } # @@ -88,14 +88,14 @@ Class.Base."output_audio_format" { # DefineAttribute."obs" { # Token set reference name and type - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" } #output sample_type DefineAttribute."out_sample_type" { type string # Token set reference name - token_ref "sof_tkn_cavs_audio_format.word" + token_ref "cavs_audio_format.word" constraints { !valid_values [ $SAMPLE_TYPE_MSB_INTEGER diff --git a/tools/topology/topology2/include/common/output_pin_binding.conf b/tools/topology/topology2/include/common/output_pin_binding.conf index a7acd10f4e50..27bc678c60b1 100644 --- a/tools/topology/topology2/include/common/output_pin_binding.conf +++ b/tools/topology/topology2/include/common/output_pin_binding.conf @@ -17,7 +17,7 @@ Class.Base."output_pin_binding" { # The widget name that the output pin should be bound with. DefineAttribute."output_pin_binding_name" { - token_ref "sof_tkn_comp.string" + token_ref "comp.string" } attributes { diff --git a/tools/topology/topology2/include/common/pcm.conf b/tools/topology/topology2/include/common/pcm.conf index af07a2438199..1ba79ff852b2 100644 --- a/tools/topology/topology2/include/common/pcm.conf +++ b/tools/topology/topology2/include/common/pcm.conf @@ -36,12 +36,12 @@ Class.PCM."pcm" { DefineAttribute."playback_compatible_d0i3" { # Token reference and type - token_ref "sof_tkn_stream.bool" + token_ref "stream.bool" } DefineAttribute."capture_compatible_d0i3" { # Token reference and type - token_ref "sof_tkn_stream.bool" + token_ref "stream.bool" } attributes { diff --git a/tools/topology/topology2/include/common/tokens.conf b/tools/topology/topology2/include/common/tokens.conf index 61aa8c2f506f..3277c7cb0497 100644 --- a/tools/topology/topology2/include/common/tokens.conf +++ b/tools/topology/topology2/include/common/tokens.conf @@ -4,7 +4,7 @@ Object.Base.VendorToken { "1" { - name "sof_tkn_comp" + name "comp" period_sink_count 400 # not used with IPC4 period_source_count 401 # not used with IPC4 format 402 @@ -27,7 +27,7 @@ Object.Base.VendorToken { } "2" { - name "sof_tkn_dai" + name "dai" # Token retired with ABI 3.2, do not use for new capabilities dmac_config 153 dai_type 154 @@ -36,32 +36,32 @@ Object.Base.VendorToken { } "3" { - name "sof_tkn_buffer" + name "buffer" size 100 caps 101 } "4" { - name "sof_tkn_volume" + name "volume" ramp_step_type 250 ramp_step_ms 251 } "5" { - name "sof_tkn_gain" + name "gain" curve_type 260 curve_duration 261 init_value 262 } "6" { - name "sof_tkn_src" + name "src" rate_in 300 rate_out 301 } "7" { - name "sof_tkn_asrc" + name "asrc" rate_in 320 rate_out 321 asynchronous_mode 322 @@ -69,7 +69,7 @@ Object.Base.VendorToken { } "8" { - name "sof_tkn_scheduler" + name "scheduler" period 200 priority 201 mips 202 @@ -84,7 +84,7 @@ Object.Base.VendorToken { } "9" { - name "sof_tkn_intel_ssp" + name "intel_ssp" clks_control 500 mclk_id 501 sample_bits 502 @@ -95,7 +95,7 @@ Object.Base.VendorToken { } "10" { - name "sof_tkn_intel_dmic" + name "intel_dmic" driver_version 600 clk_min 601 clk_max 602 @@ -110,7 +110,7 @@ Object.Base.VendorToken { } "11" { - name "sof_tkn_intel_dmic_pdm" + name "intel_dmic_pdm" ctrl_id 700 mic_a_enable 701 mic_b_enable 702 @@ -122,31 +122,31 @@ Object.Base.VendorToken { } "13" { - name "sof_tkn_stream" + name "stream" playback_compatible_d0i3 "1200" capture_compatible_d0i3 "1201" } "14" { - name "sof_tkn_mute_led" + name "mute_led" mute_led_use 1300 mute_led_direction 1301 } "15" { - name "sof_tkn_alh" + name "alh" rate 1400 channels 1401 } "16" { - name "sof_tkn_mixinout" + name "mixinout" mix_type 1700 } # ABI 4.0 onwards "17" { - name "sof_tkn_cavs_audio_format" + name "cavs_audio_format" in_rate 1900 in_bit_depth 1901 in_valid_bit_depth 1902 @@ -176,7 +176,7 @@ Object.Base.VendorToken { # ABI 4.0 onwards "18" { - name "sof_tkn_copier" + name "copier" node_type 1980 deep_buffer_dma_ms 1981 } diff --git a/tools/topology/topology2/include/common/vendor-token.conf b/tools/topology/topology2/include/common/vendor-token.conf index 722cd7867c96..65ac4ab940c2 100644 --- a/tools/topology/topology2/include/common/vendor-token.conf +++ b/tools/topology/topology2/include/common/vendor-token.conf @@ -4,7 +4,7 @@ # # Usage: this component can be used by instantiating it in the parent object. i.e. # -# Object.Base.VendorToken. "sof_tkn_comp" { +# Object.Base.VendorToken. "comp" { # # Token retired with ABI 3.2, do not use for new capabilities # preload_count 403 # core_id 404 diff --git a/tools/topology/topology2/include/components/alh-dai-copier.conf b/tools/topology/topology2/include/components/alh-dai-copier.conf index b1eaab2a17fd..a3f3ffb2309e 100644 --- a/tools/topology/topology2/include/components/alh-dai-copier.conf +++ b/tools/topology/topology2/include/components/alh-dai-copier.conf @@ -21,7 +21,7 @@ Class.Widget."alh-copier" { # DAI index: this is always 0 when there is no aggregation. DefineAttribute."dai_index" { - token_ref "sof_tkn_dai.word" + token_ref "dai.word" } # @@ -32,27 +32,18 @@ Class.Widget."alh-copier" { #include common component definition - # - # alh-copier component UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # # Bespoke Attribute Definitions for alh-copier # DefineAttribute."dai_type" { type "string" - token_ref "sof_tkn_dai.string" + token_ref "dai.string" } DefineAttribute."direction" { type "string" - token_ref "sof_tkn_dai.word" + token_ref "dai.word" constraints { !valid_values [ "playback" @@ -70,19 +61,19 @@ Class.Widget."alh-copier" { # DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } DefineAttribute."bss_size" {} DefineAttribute."is_pages" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } DefineAttribute."node_type" { # Token set reference name and type - token_ref "sof_tkn_copier.word" + token_ref "copier.word" constraints { !valid_values [ $ALH_LINK_OUTPUT_CLASS # ALH link output, legacy for SNDW (DSP ->) diff --git a/tools/topology/topology2/include/components/asrc.conf b/tools/topology/topology2/include/components/asrc.conf index 9ea02c887c92..5737186ca67b 100644 --- a/tools/topology/topology2/include/components/asrc.conf +++ b/tools/topology/topology2/include/components/asrc.conf @@ -28,15 +28,6 @@ Class.Widget."asrc" { #include common component definition - # - # ASRC widget UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # # Bespoke attributes for ASRC # @@ -44,24 +35,24 @@ Class.Widget."asrc" { # Source sample rate DefineAttribute."rate_in" { # Token set reference name and type - token_ref "sof_tkn_asrc.word" + token_ref "asrc.word" } # Target sample rate DefineAttribute."rate_out" { # Token set reference name and type - token_ref "sof_tkn_asrc.word" + token_ref "asrc.word" } DefineAttribute."asynchronous_mode" { # Token set reference name and type - token_ref "sof_tkn_asrc.word" + token_ref "asrc.word" } DefineAttribute."operation_mode" { # Token set reference name and type - token_ref "sof_tkn_asrc.word" + token_ref "asrc.word" } attributes { diff --git a/tools/topology/topology2/include/components/buffer.conf b/tools/topology/topology2/include/components/buffer.conf index 9e6cc7537717..32dfcebd29f8 100644 --- a/tools/topology/topology2/include/components/buffer.conf +++ b/tools/topology/topology2/include/components/buffer.conf @@ -27,14 +27,6 @@ Class.Widget."buffer" { #include common component definition - # - # Buffer component UUID - # - DefineAttribute."uuid" { - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # # Bespoke Attribute Definitions for Buffers # @@ -45,7 +37,7 @@ Class.Widget."buffer" { # DefineAttribute."size" { # Token reference and type - token_ref "sof_tkn_buffer.word" + token_ref "buffer.word" } # Number of periods @@ -61,7 +53,7 @@ Class.Widget."buffer" { DefineAttribute."caps" { type "string" # Token reference and type - token_ref "sof_tkn_buffer.word" + token_ref "buffer.word" constraints { !valid_values [ "dai" diff --git a/tools/topology/topology2/include/components/copier.conf b/tools/topology/topology2/include/components/dai-copier.conf similarity index 71% rename from tools/topology/topology2/include/components/copier.conf rename to tools/topology/topology2/include/components/dai-copier.conf index 9e46da0e1242..e57025c5651f 100644 --- a/tools/topology/topology2/include/components/copier.conf +++ b/tools/topology/topology2/include/components/dai-copier.conf @@ -1,30 +1,30 @@ # -# Common pipeline copier +# DAI gateway copier # -# A generic copier widget. All attributes defined herein are namespaced -# by alsatplg to "Object.Widget.copier.N.attribute_name" +# A DAI copier widget. All attributes defined herein are namespaced +# by alsatplg to "Object.Widget.dai-copier.N.attribute_name" # # Usage: this component can be used by instantiating it in the parent object. i.e. # -# Object.Widget.copier."N" { -# copier_type "host" +# Object.Widget.dai-copier."N" { +# copier_type "DMIC" # cpc 100000 # } # -# Where N is the unique instance number for the copier object within the same alsaconf node. +# Where N is the unique instance number for the dai-copier object within the same alsaconf node. -Class.Widget."copier" { +Class.Widget."dai-copier" { # - # Pipeline ID for the copier object + # Pipeline ID for the dai-copier object # DefineAttribute."index" {} DefineAttribute."dai_index" { - token_ref "sof_tkn_dai.word" + token_ref "dai.word" } # - # Copier object instance + # dai-copier object instance # DefineAttribute."instance" {} @@ -32,20 +32,11 @@ Class.Widget."copier" { # - # Copier component UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - - # - # Bespoke Attribute Definitions for Copiers + # Bespoke Attribute Definitions for dai-copier # # - # copier type in pipeline. + # dai-copier type in pipeline. # DefineAttribute."copier_type" { constraints { @@ -59,7 +50,7 @@ Class.Widget."copier" { DefineAttribute."dai_type" { type "string" - token_ref "sof_tkn_dai.string" + token_ref "dai.string" constraints { !valid_values [ "SSP" @@ -71,7 +62,7 @@ Class.Widget."copier" { DefineAttribute."direction" { type "string" - token_ref "sof_tkn_dai.word" + token_ref "dai.word" constraints { !valid_values [ "playback" @@ -89,19 +80,19 @@ Class.Widget."copier" { # DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } DefineAttribute."bss_size" {} DefineAttribute."is_pages" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } DefineAttribute."node_type" { # Token set reference name and type - token_ref "sof_tkn_copier.word" + token_ref "copier.word" constraints { !valid_values [ $HDA_LINK_OUTPUT_CLASS # HD/A link output (DSP ->) @@ -123,13 +114,13 @@ Class.Widget."copier" { attributes { # - # The copier widget name would be constructed using the copier type, index and - # instance attributes. For ex: "copier.SSP.0.1". + # The dai-copier widget name would be constructed using the dai-copier type, index + # and instance attributes. For ex: "dai-copier.SSP.0.1". # !constructor [ "copier_type" - "index" - "instance" + "stream_name" + "direction" ] # @@ -139,8 +130,6 @@ Class.Widget."copier" { "no_pm" "uuid" "copier_type" - "num_input_pins" - "num_output_pins" "num_input_audio_formats" "num_output_audio_formats" "node_type" @@ -148,6 +137,9 @@ Class.Widget."copier" { # # immutable attributes cannot be modified in the object instance + # num_input_audio_formats for capture and num_output_formats for playback are + # mandatory even though the num_input_pins/num_output_pins are 0 because + # these are used to set the DMA buffer format. # !immutable [ "uuid" @@ -164,7 +156,7 @@ Class.Widget."copier" { } # - # Default attributes for Copier + # Default attributes for dai-copier # #UUID: 9BA00C83-CA12-4A83-943C-1FA2E82F9DDA uuid "83:0c:a0:9b:12:CA:83:4a:94:3c:1f:a2:e8:2f:9d:da" @@ -172,8 +164,6 @@ Class.Widget."copier" { core_id 0 cpc 1647 bss_size 280 - num_input_pins 1 - num_output_pins 4 # math expression for computing is_pages is_pages "$[(($bss_size + 4095) & -4095) / 4096]" diff --git a/tools/topology/topology2/include/components/dai.conf b/tools/topology/topology2/include/components/dai.conf index 51d33dec9efe..9423fd58d62d 100644 --- a/tools/topology/topology2/include/components/dai.conf +++ b/tools/topology/topology2/include/components/dai.conf @@ -21,7 +21,7 @@ Class.Widget."dai" { # Type of DAI DefineAttribute."dai_type" { type "string" - token_ref "sof_tkn_dai.string" + token_ref "dai.string" constraints { !valid_values [ "SSP" @@ -38,7 +38,7 @@ Class.Widget."dai" { # DAI Index in the firmware DefineAttribute."dai_index" { # Token reference and type - token_ref "sof_tkn_dai.word" + token_ref "dai.word" } # @@ -46,7 +46,7 @@ Class.Widget."dai" { # DefineAttribute."direction" { type "string" - token_ref "sof_tkn_dai.word" + token_ref "dai.word" constraints { !valid_values [ "playback" @@ -67,17 +67,11 @@ Class.Widget."dai" { # DefineAttribute."index" {} - DefineAttribute.uuid { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # Bespoke attributes for DAI DefineAttribute."format" { type "string" # Token reference and type - token_ref "sof_tkn_comp.string" + token_ref "comp.string" } # Attribute categories diff --git a/tools/topology/topology2/include/components/eqfir.conf b/tools/topology/topology2/include/components/eqfir.conf index e294f9e3ba15..c5e648908d98 100644 --- a/tools/topology/topology2/include/components/eqfir.conf +++ b/tools/topology/topology2/include/components/eqfir.conf @@ -31,11 +31,6 @@ Class.Widget."eqfir" { # Include common widget attributes definition - DefineAttribute.uuid { - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - attributes { !constructor [ "index" diff --git a/tools/topology/topology2/include/components/eqiir.conf b/tools/topology/topology2/include/components/eqiir.conf index 3a0b20247d3b..ee7fb930d9ad 100644 --- a/tools/topology/topology2/include/components/eqiir.conf +++ b/tools/topology/topology2/include/components/eqiir.conf @@ -31,11 +31,6 @@ Class.Widget."eqiir" { # Include common widget attributes definition - DefineAttribute.uuid { - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - attributes { !constructor [ "index" diff --git a/tools/topology/topology2/include/components/gain.conf b/tools/topology/topology2/include/components/gain.conf index 931998c598a5..395edb64ba94 100644 --- a/tools/topology/topology2/include/components/gain.conf +++ b/tools/topology/topology2/include/components/gain.conf @@ -30,15 +30,6 @@ Class.Widget."gain" { #include common component definition - # - # gain widget UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # # Bespoke attributes for PGA # @@ -51,7 +42,7 @@ Class.Widget."gain" { DefineAttribute."curve_type" { type "string" # Token set reference name - token_ref "sof_tkn_gain.word" + token_ref "gain.word" constraints { !valid_values [ "no_fade" @@ -69,12 +60,12 @@ Class.Widget."gain" { # DefineAttribute."curve_duration" { # Token set reference name - token_ref "sof_tkn_gain.word" + token_ref "gain.word" } DefineAttribute."init_value" { # Token set reference name - token_ref "sof_tkn_gain.word" + token_ref "gain.word" } # Attribute categories diff --git a/tools/topology/topology2/include/components/google-rtc-aec.conf b/tools/topology/topology2/include/components/google-rtc-aec.conf index f4c27ece570c..64f03a49c675 100644 --- a/tools/topology/topology2/include/components/google-rtc-aec.conf +++ b/tools/topology/topology2/include/components/google-rtc-aec.conf @@ -32,26 +32,17 @@ Class.Widget."google-rtc-aec" { DefineAttribute."num_audio_formats" { # Token set reference name and type - token_ref "sof_tkn_comp.word" - } - - # - # google-rtc-aec widget UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" + token_ref "comp.word" } DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } DefineAttribute."is_pages" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } # Attribute categories diff --git a/tools/topology/topology2/include/components/host-copier.conf b/tools/topology/topology2/include/components/host-copier.conf index 51b952f07f56..fc9cdc2ed680 100644 --- a/tools/topology/topology2/include/components/host-copier.conf +++ b/tools/topology/topology2/include/components/host-copier.conf @@ -29,22 +29,13 @@ Class.Widget."host-copier" { #include common component definition - # - # host-copier component UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # # Bespoke Attribute Definitions for host copiers # DefineAttribute."direction" { type "string" - token_ref "sof_tkn_dai.word" + token_ref "dai.word" constraints { !valid_values [ "playback" @@ -62,19 +53,19 @@ Class.Widget."host-copier" { # DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } DefineAttribute."bss_size" {} DefineAttribute."is_pages" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } DefineAttribute."node_type" { # Token set reference name and type - token_ref "sof_tkn_copier.word" + token_ref "copier.word" constraints { !valid_values [ $HDA_HOST_OUTPUT_CLASS # HD/A host output (-> DSP) @@ -89,7 +80,7 @@ Class.Widget."host-copier" { # DefineAttribute."deep_buffer_dma_ms" { # Token set reference name and type - token_ref "sof_tkn_copier.word" + token_ref "copier.word" } attributes { diff --git a/tools/topology/topology2/include/components/host.conf b/tools/topology/topology2/include/components/host.conf index 8b8cf36acf11..2316d0120363 100644 --- a/tools/topology/topology2/include/components/host.conf +++ b/tools/topology/topology2/include/components/host.conf @@ -59,12 +59,6 @@ Class.Widget."host" { #include common widget attributes - DefineAttribute.uuid { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # Attribute categories attributes { # diff --git a/tools/topology/topology2/include/components/kpb.conf b/tools/topology/topology2/include/components/kpb.conf index a1b25a2aabb5..e5d3c24146a1 100644 --- a/tools/topology/topology2/include/components/kpb.conf +++ b/tools/topology/topology2/include/components/kpb.conf @@ -25,21 +25,12 @@ Class.Widget."kpb" { DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } #include common component definition - # - # kpb component UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - attributes { # # The kpb widget name would be constructed using the index and diff --git a/tools/topology/topology2/include/components/micsel.conf b/tools/topology/topology2/include/components/micsel.conf index f81d0b8c65c3..e9c40d316f1d 100644 --- a/tools/topology/topology2/include/components/micsel.conf +++ b/tools/topology/topology2/include/components/micsel.conf @@ -25,21 +25,12 @@ Class.Widget."micsel" { DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } #include common component definition - # - # micsel component UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - attributes { # # The micsel widget name would be constructed using the index and diff --git a/tools/topology/topology2/include/components/mixin.conf b/tools/topology/topology2/include/components/mixin.conf index e43e54062243..bfe4f86927be 100644 --- a/tools/topology/topology2/include/components/mixin.conf +++ b/tools/topology/topology2/include/components/mixin.conf @@ -26,7 +26,7 @@ Class.Widget."mixin" { DefineAttribute."mix_type" { type "string" - token_ref "sof_tkn_mixinout.word" + token_ref "mixinout.word" constraints { !valid_values [ "mix_in" @@ -41,21 +41,12 @@ Class.Widget."mixin" { DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } #include common component definition - # - # Copier component UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - attributes { # # The mixin widget name would be constructed using the index and diff --git a/tools/topology/topology2/include/components/mixout.conf b/tools/topology/topology2/include/components/mixout.conf index d6fdf989bd55..88f30ea7fd3a 100644 --- a/tools/topology/topology2/include/components/mixout.conf +++ b/tools/topology/topology2/include/components/mixout.conf @@ -26,7 +26,7 @@ Class.Widget."mixout" { DefineAttribute."mix_type" { type "string" - token_ref "sof_tkn_mixinout.word" + token_ref "mixinout.word" constraints { !valid_values [ "mix_in" @@ -41,21 +41,12 @@ Class.Widget."mixout" { DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } #include common component definition - # - # Copier component UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - attributes { # # The mixout widget name is constructed using the index and instance attributes. diff --git a/tools/topology/topology2/include/components/module-copier.conf b/tools/topology/topology2/include/components/module-copier.conf index d8eb2f9c2679..796402f5dcf7 100644 --- a/tools/topology/topology2/include/components/module-copier.conf +++ b/tools/topology/topology2/include/components/module-copier.conf @@ -27,15 +27,6 @@ Class.Widget."module-copier" { #include common component definition - # - # module-copier component UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # # Bespoke Attribute Definitions for module-copiers # @@ -45,14 +36,14 @@ Class.Widget."module-copier" { # DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } DefineAttribute."bss_size" {} DefineAttribute."is_pages" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } attributes { diff --git a/tools/topology/topology2/include/components/muxdemux.conf b/tools/topology/topology2/include/components/muxdemux.conf index c762f89d5f3a..de7a18be57cb 100644 --- a/tools/topology/topology2/include/components/muxdemux.conf +++ b/tools/topology/topology2/include/components/muxdemux.conf @@ -29,19 +29,13 @@ Class.Widget."muxdemux" { #include common widget attribute definitions - DefineAttribute.uuid { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # # Process type for muxdemux widget # DefineAttribute.process_type { type "string" # Token set reference name and type - token_ref "sof_tkn_process.string" + token_ref "process.string" } # attribute categories diff --git a/tools/topology/topology2/include/components/pipeline.conf b/tools/topology/topology2/include/components/pipeline.conf index 92f3e11d3ecf..ddb6448bd4cb 100644 --- a/tools/topology/topology2/include/components/pipeline.conf +++ b/tools/topology/topology2/include/components/pipeline.conf @@ -33,7 +33,7 @@ Class.Widget."pipeline" { # Scheduling period DefineAttribute."period" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" constraints { min 333 max 1000 @@ -41,10 +41,10 @@ Class.Widget."pipeline" { } # Scheduler time domain. The value provided will be translated to 0/1 based on - # sof_tkn_scheduler_time_domain. For exameple: "timer" will be converted to 0. + # scheduler_time_domain. For exameple: "timer" will be converted to 0. DefineAttribute."time_domain" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" constraints { !valid_values [ "timer" @@ -60,36 +60,36 @@ Class.Widget."pipeline" { # pipeline priority DefineAttribute."priority" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" } # core that the pipeline should be scheduled on DefineAttribute."core" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" } # frames per period DefineAttribute."frames" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" } # mips requirement for pipeline DefineAttribute."mips" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" } # flag to set the pipeline as dynamic DefineAttribute."dynamic_pipeline" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" } DefineAttribute."lp_mode" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" constraints { !tuple_values [ 1 @@ -101,7 +101,7 @@ Class.Widget."pipeline" { # Skip setting up the pipeline in the DSP in the case of chained DMA mode DefineAttribute."use_chain_dma" { type "string" - token_ref "sof_tkn_scheduler.bool" + token_ref "scheduler.bool" constraints { !valid_values [ "true" @@ -113,7 +113,7 @@ Class.Widget."pipeline" { # kcps requirements for the pipeline, default value defined bellow DefineAttribute."kcps" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" } attributes { diff --git a/tools/topology/topology2/include/components/smart_amp.conf b/tools/topology/topology2/include/components/smart_amp.conf index 0f36fe66f420..6913ab147611 100644 --- a/tools/topology/topology2/include/components/smart_amp.conf +++ b/tools/topology/topology2/include/components/smart_amp.conf @@ -28,23 +28,14 @@ Class.Widget."smart_amp" { #include common component definition - # - # smart_amp widget UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } DefineAttribute."is_pages" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } Object.Control.bytes."1" { diff --git a/tools/topology/topology2/include/components/src.conf b/tools/topology/topology2/include/components/src.conf index a1ab81b019d3..fbd0e4e90e66 100644 --- a/tools/topology/topology2/include/components/src.conf +++ b/tools/topology/topology2/include/components/src.conf @@ -26,15 +26,6 @@ Class.Widget."src" { #include common component definition - # - # SRC widget UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # # Bespoke attributes for SRC # @@ -42,14 +33,14 @@ Class.Widget."src" { # Source sample rate DefineAttribute."rate_in" { # Token set reference name and type - token_ref "sof_tkn_src.word" + token_ref "src.word" } # Target sample rate DefineAttribute."rate_out" { # Token set reference name and type - token_ref "sof_tkn_src.word" + token_ref "src.word" } attributes { diff --git a/tools/topology/topology2/include/components/volume.conf b/tools/topology/topology2/include/components/volume.conf index 0ed26801e421..cbcf8b0bffc3 100644 --- a/tools/topology/topology2/include/components/volume.conf +++ b/tools/topology/topology2/include/components/volume.conf @@ -30,15 +30,6 @@ Class.Widget."pga" { #include common component definition - # - # pga widget UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - # # Bespoke attributes for PGA # @@ -51,7 +42,7 @@ Class.Widget."pga" { DefineAttribute."ramp_step_type" { type "string" # Token set reference name - token_ref "sof_tkn_volume.word" + token_ref "volume.word" constraints { !valid_values [ "linear" @@ -73,7 +64,7 @@ Class.Widget."pga" { # DefineAttribute."ramp_step_ms" { # Token set reference name - token_ref "sof_tkn_volume.word" + token_ref "volume.word" } # Attribute categories diff --git a/tools/topology/topology2/include/components/widget-common.conf b/tools/topology/topology2/include/components/widget-common.conf index ee40ad6156f3..07705ad23317 100644 --- a/tools/topology/topology2/include/components/widget-common.conf +++ b/tools/topology/topology2/include/components/widget-common.conf @@ -51,7 +51,7 @@ DefineAttribute.event_flags {} DefineAttribute."format" { type "string" # Token set reference name and type - token_ref "sof_tkn_comp.string" + token_ref "comp.string" constraints { !valid_values [ "s16le" @@ -65,35 +65,42 @@ DefineAttribute."format" { # ID of the core this widget should be scheduled on DefineAttribute."core_id" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } # number of periods to preload DefineAttribute."preload_count" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } # Number of sink pins a widget can support DefineAttribute."num_input_pins" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } # Number of source pins a widget can support DefineAttribute."num_output_pins" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } # Number of supported sink(input) audio formats DefineAttribute."num_input_audio_formats" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } # Number of supported source(output) audio formats DefineAttribute."num_output_audio_formats" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" +} + +# Widget UUID +DefineAttribute.uuid { + type "string" + # Token set reference name and type + token_ref "comp.uuid" } diff --git a/tools/topology/topology2/include/components/wov.conf b/tools/topology/topology2/include/components/wov.conf index 747e3031ff38..9250a7eeeae7 100644 --- a/tools/topology/topology2/include/components/wov.conf +++ b/tools/topology/topology2/include/components/wov.conf @@ -27,24 +27,15 @@ Class.Widget."wov" { DefineAttribute."cpc" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } #include common component definition - # - # wov component UUID - # - DefineAttribute."uuid" { - type "string" - # Token set reference name and type - token_ref "sof_tkn_comp.uuid" - } - DefineAttribute."is_pages" { # Token set reference name and type - token_ref "sof_tkn_comp.word" + token_ref "comp.word" } attributes { diff --git a/tools/topology/topology2/include/controls/mixer.conf b/tools/topology/topology2/include/controls/mixer.conf index 7cdaeaf92b66..66b5085cf857 100644 --- a/tools/topology/topology2/include/controls/mixer.conf +++ b/tools/topology/topology2/include/controls/mixer.conf @@ -67,12 +67,12 @@ Class.Control."mixer" { # use mute LED DefineAttribute."mute_led_use" { - token_ref "sof_tkn_mute_led.word" + token_ref "mute_led.word" } # LED direction DefineAttribute."mute_led_direction" { - token_ref "sof_tkn_mute_led.word" + token_ref "mute_led.word" } # diff --git a/tools/topology/topology2/include/dais/alh.conf b/tools/topology/topology2/include/dais/alh.conf index bb59c3144ed6..4f4908455cb6 100644 --- a/tools/topology/topology2/include/dais/alh.conf +++ b/tools/topology/topology2/include/dais/alh.conf @@ -26,12 +26,12 @@ Class.Dai."ALH" { # Argument used to construct DAI widget # DefineAttribute."dai_index" { - token_ref "sof_tkn_dai.word" + token_ref "dai.word" } DefineAttribute."direction" { type "string" - token_ref "sof_tkn_dai.word" + token_ref "dai.word" constraints { !valid_values [ "playback" @@ -43,7 +43,7 @@ Class.Dai."ALH" { DefineAttribute."dai_type" { type "string" - token_ref "sof_tkn_dai.string" + token_ref "dai.string" } DefineAttribute."default_hw_config_id" {} @@ -57,11 +57,11 @@ Class.Dai."ALH" { } DefineAttribute."rate" { - token_ref "sof_tkn_alh.word" + token_ref "alh.word" } DefineAttribute."channels" { - token_ref "sof_tkn_alh.word" + token_ref "alh.word" } # Backend DAI Link ID matching with the machine driver diff --git a/tools/topology/topology2/include/dais/dmic.conf b/tools/topology/topology2/include/dais/dmic.conf index e36767b2fd69..812f143fd988 100644 --- a/tools/topology/topology2/include/dais/dmic.conf +++ b/tools/topology/topology2/include/dais/dmic.conf @@ -33,7 +33,7 @@ Class.Dai."DMIC" { # # DAI Index DefineAttribute."dai_index" { - token_ref "sof_tkn_dai.word" + token_ref "dai.word" } DefineAttribute."direction" { @@ -42,7 +42,7 @@ Class.Dai."DMIC" { DefineAttribute."dai_type" { type "string" - token_ref "sof_tkn_dai.string" + token_ref "dai.string" } # Backend DAI Link ID matching with the machine driver @@ -55,39 +55,39 @@ Class.Dai."DMIC" { } DefineAttribute.driver_version { - token_ref "sof_tkn_intel_dmic.word" + token_ref "intel_dmic.word" } DefineAttribute.clk_min { - token_ref "sof_tkn_intel_dmic.word" + token_ref "intel_dmic.word" } DefineAttribute.clk_max { - token_ref "sof_tkn_intel_dmic.word" + token_ref "intel_dmic.word" } DefineAttribute.duty_min { - token_ref "sof_tkn_intel_dmic.word" + token_ref "intel_dmic.word" } DefineAttribute.duty_max { - token_ref "sof_tkn_intel_dmic.word" + token_ref "intel_dmic.word" } DefineAttribute.num_pdm_active { - token_ref "sof_tkn_intel_dmic.word" + token_ref "intel_dmic.word" } DefineAttribute.sample_rate { - token_ref "sof_tkn_intel_dmic.word" + token_ref "intel_dmic.word" } DefineAttribute.fifo_word_length { - token_ref "sof_tkn_intel_dmic.word" + token_ref "intel_dmic.word" } DefineAttribute.unmute_ramp_time_ms { - token_ref "sof_tkn_intel_dmic.word" + token_ref "intel_dmic.word" } # platform clock frequency diff --git a/tools/topology/topology2/include/dais/hda.conf b/tools/topology/topology2/include/dais/hda.conf index 0d3824f82812..6194b74e6d87 100644 --- a/tools/topology/topology2/include/dais/hda.conf +++ b/tools/topology/topology2/include/dais/hda.conf @@ -33,7 +33,7 @@ Class.Dai."HDA" { # DAI Index in the firmware # DefineAttribute."dai_index" { - token_ref "sof_tkn_dai.word" + token_ref "dai.word" } DefineAttribute."direction" { @@ -50,7 +50,7 @@ Class.Dai."HDA" { # type of DAI DefineAttribute.dai_type { type "string" - token_ref "sof_tkn_dai.string" + token_ref "dai.string" } # Backend DAI Link ID matching with the machine driver diff --git a/tools/topology/topology2/include/dais/pdm_config.conf b/tools/topology/topology2/include/dais/pdm_config.conf index 7d75ee9dbdb5..2a8759a7742c 100644 --- a/tools/topology/topology2/include/dais/pdm_config.conf +++ b/tools/topology/topology2/include/dais/pdm_config.conf @@ -4,31 +4,31 @@ Class.Base."pdm_config" { # Argument used to construct DMIC PDM config # DefineAttribute."ctrl_id" { - token_ref "sof_tkn_intel_dmic_pdm.short" + token_ref "intel_dmic_pdm.short" } DefineAttribute.mic_a_enable { - token_ref "sof_tkn_intel_dmic_pdm.short" + token_ref "intel_dmic_pdm.short" } DefineAttribute.mic_b_enable { - token_ref "sof_tkn_intel_dmic_pdm.short" + token_ref "intel_dmic_pdm.short" } DefineAttribute.polarity_a { - token_ref "sof_tkn_intel_dmic_pdm.short" + token_ref "intel_dmic_pdm.short" } DefineAttribute.polarity_b { - token_ref "sof_tkn_intel_dmic_pdm.short" + token_ref "intel_dmic_pdm.short" } DefineAttribute.clk_edge { - token_ref "sof_tkn_intel_dmic_pdm.short" + token_ref "intel_dmic_pdm.short" } DefineAttribute.skew { - token_ref "sof_tkn_intel_dmic_pdm.short" + token_ref "intel_dmic_pdm.short" } attributes { diff --git a/tools/topology/topology2/include/dais/ssp.conf b/tools/topology/topology2/include/dais/ssp.conf index 287342b4c96f..6c0d91f2bd69 100644 --- a/tools/topology/topology2/include/dais/ssp.conf +++ b/tools/topology/topology2/include/dais/ssp.conf @@ -33,7 +33,7 @@ Class.Dai."SSP" { # DAI Index DefineAttribute."dai_index" { - token_ref "sof_tkn_dai.word" + token_ref "dai.word" } DefineAttribute."direction" { @@ -49,7 +49,7 @@ Class.Dai."SSP" { DefineAttribute."dai_type" { type "string" - token_ref "sof_tkn_dai.string" + token_ref "dai.string" } DefineAttribute."default_hw_config_id" {} @@ -63,18 +63,18 @@ Class.Dai."SSP" { DefineAttribute."sample_bits" { # Token reference and type - token_ref "sof_tkn_intel_ssp.word" + token_ref "intel_ssp.word" } DefineAttribute."bclk_delay" { # Token reference and type - token_ref "sof_tkn_intel_ssp.word" + token_ref "intel_ssp.word" } DefineAttribute."tdm_padding_per_slot" { type "string" # Token reference and type - token_ref "sof_tkn_intel_ssp.bool" + token_ref "intel_ssp.bool" constraints { !valid_values [ "true" @@ -83,11 +83,11 @@ Class.Dai."SSP" { } } - # SSP quirks. Value will translated based on sof_tkn_ssp_quirks. For ex: lb_mode will + # SSP quirks. Value will translated based on ssp_quirks. For ex: lb_mode will # be converted to 64. DefineAttribute."quirks" { # Token reference and type - token_ref "sof_tkn_intel_ssp.word" + token_ref "intel_ssp.word" constraints { !valid_values [ "lbm_mode" @@ -101,7 +101,7 @@ Class.Dai."SSP" { DefineAttribute."mclk_id" { # Token reference and type - token_ref "sof_tkn_intel_ssp.short" + token_ref "intel_ssp.short" } # platform clock frequency diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf index 46d0e689c165..8727184ee485 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf @@ -17,7 +17,7 @@ # - + Class.Pipeline."dai-copier-be" { @@ -35,10 +35,12 @@ Class.Pipeline."dai-copier-be" { } Object.Widget { - copier."1" { + dai-copier."1" { type dai_in num_input_audio_formats 3 num_output_audio_formats 3 + num_output_pins 1 + # 32-bit 48KHz 2ch Object.Base.audio_format.1 { in_bit_depth 32 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 9dfff186df4c..44198587b917 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 @@ -17,7 +17,7 @@ # - + @@ -46,10 +46,12 @@ Class.Pipeline."dai-copier-eqiir-module-copier-capture" { } Object.Widget { - copier."1" { + dai-copier."1" { type dai_out num_input_audio_formats 1 num_output_audio_formats 1 + num_output_pins 1 + # copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch Object.Base.audio_format.1 { in_bit_depth 32 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 965adc174e74..a5ce31f7aa30 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 @@ -17,7 +17,7 @@ # - + @@ -45,11 +45,13 @@ Class.Pipeline."dai-copier-gain-mixin-capture" { } Object.Widget { - copier."1" { + dai-copier."1" { type dai_out node_type $HDA_LINK_INPUT_CLASS num_input_audio_formats 1 num_output_audio_formats 1 + num_output_pins 1 + # copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch Object.Base.audio_format.1 { in_bit_depth 32 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 dfa3c2752064..072a5f9be1be 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 @@ -17,7 +17,7 @@ # - + @@ -45,10 +45,12 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" { } Object.Widget { - copier."1" { + dai-copier."1" { type dai_out num_input_audio_formats 1 num_output_audio_formats 1 + num_output_pins 1 + # copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch Object.Base.audio_format.1 { in_bit_depth 32 diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf b/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf index 65536755deea..7d3faef7a25d 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf @@ -18,7 +18,7 @@ # - + @@ -41,11 +41,13 @@ Class.Pipeline."dai-kpb-be" { } Object.Widget { - copier."1" { + dai-copier."1" { type dai_in node_type $HDA_LINK_OUTPUT_CLASS num_input_audio_formats 3 num_output_audio_formats 3 + num_output_pins 1 + # 32-bit 48KHz 2ch Object.Base.audio_format.3 { in_bit_depth 32 @@ -118,7 +120,7 @@ Class.Pipeline."dai-kpb-be" { Object.Base { route."1" { - source "copier.DMIC.$index.1" + source "dai-copier.DMIC.$index.1" sink "kpb.$index.1" } } diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf b/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf index 2989738bde61..416a4c3b59e1 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf @@ -17,7 +17,7 @@ # - + diff --git a/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf b/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf index 58b7dfbffb04..6699ff23bbd0 100644 --- a/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf @@ -17,7 +17,7 @@ # Where N is the unique pipeline ID within the same alsaconf node. # - + diff --git a/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf b/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf index b18666ef7ffc..6475b9b719c3 100644 --- a/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf @@ -18,7 +18,7 @@ # - + @@ -38,10 +38,11 @@ Class.Pipeline."highpass-capture-be" { } Object.Widget { - copier."1" { + dai-copier."1" { type dai_in num_input_audio_formats 1 num_output_audio_formats 1 + num_output_pins 1 Object.Base.audio_format.1 { in_bit_depth 32 diff --git a/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf b/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf index 0675ccd98ed5..af2094d32ecf 100644 --- a/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf @@ -18,7 +18,7 @@ # - + Class.Pipeline."io-gateway-capture" { @@ -36,10 +36,11 @@ Class.Pipeline."io-gateway-capture" { } Object.Widget { - copier."1" { + dai-copier."1" { type dai_in num_input_audio_formats 1 num_output_audio_formats 1 + num_output_pins 1 Object.Base.audio_format.1 { in_bit_depth 32 diff --git a/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf b/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf index 065ecc71012c..9906a34fc1f0 100644 --- a/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf +++ b/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf @@ -18,7 +18,7 @@ # - + Class.Pipeline."io-gateway" { @@ -40,7 +40,7 @@ Class.Pipeline."io-gateway" { } Object.Widget { - copier."1" { + dai-copier."1" { type dai_in 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 94316c85209e..c90d71556224 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 @@ -17,7 +17,7 @@ # - + @@ -46,10 +46,11 @@ Class.Pipeline."mixout-gain-dai-copier-playback" { Object.Widget { mixout."1" {} - copier."1" { + dai-copier."1" { type dai_in num_input_audio_formats 1 num_output_audio_formats 1 + num_input_pins 1 # copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch Object.Base.audio_format [ 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 428c9969e3a4..acb07b1a159e 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 @@ -17,7 +17,7 @@ # - + @@ -50,10 +50,11 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" { Object.Widget { mixout."1" {} - copier."1" { + dai-copier."1" { type dai_in num_input_audio_formats 2 num_output_audio_formats 2 + num_input_pins 1 # copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch Object.Base.audio_format.1 { 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 e9490c0e62bb..2272c815d1e2 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 @@ -17,7 +17,7 @@ # - + @@ -45,10 +45,11 @@ Class.Pipeline."mixout-gain-smart-amp-dai-copier-playback" { Object.Widget { mixout."1" {} - copier."1" { + dai-copier."1" { type dai_in num_input_audio_formats 1 num_output_audio_formats 1 + num_input_pins 1 # copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch Object.Base.audio_format [ diff --git a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf index 329b9d41c77d..b804110a921f 100644 --- a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf +++ b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf @@ -18,7 +18,7 @@ # - + diff --git a/tools/topology/topology2/include/pipelines/pipeline-common.conf b/tools/topology/topology2/include/pipelines/pipeline-common.conf index 915f859dd4fe..7a9f65f14e65 100644 --- a/tools/topology/topology2/include/pipelines/pipeline-common.conf +++ b/tools/topology/topology2/include/pipelines/pipeline-common.conf @@ -51,7 +51,7 @@ DefineAttribute."direction" { # Scheduling period DefineAttribute."period" { # Token reference and type - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" constraints { min 333 max 1000 @@ -59,11 +59,11 @@ DefineAttribute."period" { } # Scheduler time domain. The value provided will be translated to 0/1 based on -# sof_tkn_scheduler_time_domain. For example: value "timer" will be converted to 1. +# scheduler_time_domain. For example: value "timer" will be converted to 1. DefineAttribute."time_domain" { # Token reference and type type "string" - token_ref "sof_tkn_scheduler.word" + token_ref "scheduler.word" constraints { # Acceptable values for time_domain !valid_values [ diff --git a/tools/topology/topology2/platform/intel/bt-default.conf b/tools/topology/topology2/platform/intel/bt-default.conf index 8cd157c25938..2555288b7221 100644 --- a/tools/topology/topology2/platform/intel/bt-default.conf +++ b/tools/topology/topology2/platform/intel/bt-default.conf @@ -10,16 +10,10 @@ Define { BT_PB_HOST_PIPELINE_ID 7 BT_PB_DAI_PIPELINE_ID 8 - BT_PB_HOST_PIPELINE_SINK "copier.SSP.8.1" - BT_PB_DAI_PIPELINE_SRC "copier.host.7.1" - BT_PB_PIPELINE_STREAM_NAME "copier.SSP.8.1" BT_PB_PCM_CAPS "BT Playback" BT_CP_HOST_PIPELINE_ID 11 BT_CP_DAI_PIPELINE_ID 12 - BT_CP_HOST_PIPELINE_SINK "copier.host.11.1" - BT_CP_DAI_PIPELINE_SRC "copier.SSP.12.1" - BT_CP_PIPELINE_STREAM_NAME "copier.SSP.11.1" BT_CP_PCM_CAPS "BT Capture" BT_PCM_ID 2 diff --git a/tools/topology/topology2/platform/intel/bt-generic.conf b/tools/topology/topology2/platform/intel/bt-generic.conf index fdd4fa399844..57965f36b562 100644 --- a/tools/topology/topology2/platform/intel/bt-generic.conf +++ b/tools/topology/topology2/platform/intel/bt-generic.conf @@ -13,10 +13,10 @@ Object.Pipeline { index $BT_PB_DAI_PIPELINE_ID direction playback Object.Widget.pipeline.1 { - stream_name $BT_PB_PIPELINE_STREAM_NAME + stream_name "dai-copier.SSP.$BT_NAME.playback" } - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index $BT_INDEX dai_type "SSP" copier_type "SSP" @@ -24,6 +24,8 @@ Object.Pipeline { node_type $I2S_LINK_OUTPUT_CLASS num_input_audio_formats 3 num_output_audio_formats 3 + num_input_pins 1 + Object.Base.audio_format.0 { in_bit_depth 16 in_valid_bit_depth 16 @@ -60,7 +62,7 @@ Object.Pipeline { { index $BT_PB_HOST_PIPELINE_ID Object.Widget.pipeline.1 { - stream_name $BT_PB_PIPELINE_STREAM_NAME + stream_name "dai-copier.SSP.$BT_NAME.playback" } Object.Widget.host-copier.1 { stream_name $BT_PB_PCM_CAPS @@ -104,7 +106,7 @@ Object.Pipeline { { index $BT_CP_HOST_PIPELINE_ID Object.Widget.pipeline.1 { - stream_name $BT_CP_PIPELINE_STREAM_NAME + stream_name "dai-copier.SSP.$BT_NAME.capture" } Object.Widget.host-copier.1 { stream_name $BT_CP_PCM_CAPS @@ -148,10 +150,10 @@ Object.Pipeline { index $BT_CP_DAI_PIPELINE_ID direction "capture" Object.Widget.pipeline.1 { - stream_name $BT_CP_PIPELINE_STREAM_NAME + stream_name "dai-copier.SSP.$BT_NAME.capture" } - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index $BT_INDEX dai_type "SSP" type dai_out @@ -196,10 +198,10 @@ Object.Pipeline { Object.Base.route [ { source "host-copier.$BT_PCM_ID.playback" - sink $BT_PB_HOST_PIPELINE_SINK + sink "dai-copier.SSP.$BT_NAME.playback" } { - source $BT_CP_DAI_PIPELINE_SRC + source "dai-copier.SSP.$BT_NAME.capture" sink "host-copier.$BT_PCM_ID.capture" } ] diff --git a/tools/topology/topology2/platform/intel/dmic-default.conf b/tools/topology/topology2/platform/intel/dmic-default.conf index 65f75e4199e8..3f1e23526bc5 100644 --- a/tools/topology/topology2/platform/intel/dmic-default.conf +++ b/tools/topology/topology2/platform/intel/dmic-default.conf @@ -15,7 +15,7 @@ Define { DMIC0_HOST_PIPELINE_ID 11 DMIC0_DAI_PIPELINE_ID 12 DMIC0_HOST_PIPELINE_SINK "copier.host.11.1" - DMIC0_DAI_PIPELINE_SRC "copier.DMIC.12.1" + DMIC0_DAI_PIPELINE_SRC "dai-copier.DMIC.dmic01.capture" DMIC0_NAME dmic01 DMIC1_NAME dmic16k DMIC0_PCM_CAPS "Passthrough Capture 11" @@ -24,7 +24,7 @@ Define { DMIC1_DAI_PIPELINE_ID 19 WOV_PIPELINE_ID 20 DMIC1_HOST_PIPELINE_SINK 'copier.host.18.1' - DMIC_WOV_DAI_PIPELINE_SRC 'copier.DMIC.19.1' + DMIC_WOV_DAI_PIPELINE_SRC 'dai-copier.DMIC.dmic16k.capture' DMIC_WOV_DAI_PIPELINE_KPB 'kpb.19.1' WOV_PIPELINE_SINK 'micsel.20.1' WOV_PIPELINE_VIRTUAL 'virtual.detect_sink' diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf index 9d0ba0793100..99b7d2c95073 100644 --- a/tools/topology/topology2/platform/intel/dmic-generic.conf +++ b/tools/topology/topology2/platform/intel/dmic-generic.conf @@ -162,7 +162,7 @@ IncludeByKey.PASSTHROUGH { { index $DMIC0_DAI_PIPELINE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { core_id $DMIC_CORE_ID dai_index 0 dai_type "DMIC" @@ -300,7 +300,7 @@ IncludeByKey.PASSTHROUGH { Object.Pipeline.io-gateway-capture [ { index $DMIC0_DAI_PIPELINE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index 0 dai_type "DMIC" copier_type "DMIC" @@ -340,7 +340,7 @@ IncludeByKey.PASSTHROUGH { ] Object.Base.route [ { - source "copier.DMIC.$DMIC0_DAI_PIPELINE_ID.1" + source "dai-copier.DMIC.$DMIC0_NAME.capture" sink "host-copier.$DMIC0_PCM_ID.capture" } ] diff --git a/tools/topology/topology2/platform/intel/dmic-wov.conf b/tools/topology/topology2/platform/intel/dmic-wov.conf index 37796b178077..6dc4a2619b8b 100644 --- a/tools/topology/topology2/platform/intel/dmic-wov.conf +++ b/tools/topology/topology2/platform/intel/dmic-wov.conf @@ -45,7 +45,7 @@ Object.Pipeline { rate_max 16000 index $DMIC1_DAI_PIPELINE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { dai_index 1 type "dai_out" dai_type "DMIC" diff --git a/tools/topology/topology2/platform/intel/hdmi-default.conf b/tools/topology/topology2/platform/intel/hdmi-default.conf index a47dafabd425..2c0a6ded26ec 100644 --- a/tools/topology/topology2/platform/intel/hdmi-default.conf +++ b/tools/topology/topology2/platform/intel/hdmi-default.conf @@ -20,12 +20,4 @@ Define { HDMI2_PCM_CAPS "HDMI2 Playback" HDMI3_PCM_CAPS "HDMI3 Playback" HDMI4_PCM_CAPS "HDMI4 Playback" - HDMI1_HOST_PIPELINE_SINK "copier.host.50.1" - HDMI1_DAI_PIPELINE_SRC "copier.HDA.51.1" - HDMI2_HOST_PIPELINE_SINK "copier.host.60.1" - HDMI2_DAI_PIPELINE_SRC "copier.HDA.61.1" - HDMI3_HOST_PIPELINE_SINK "copier.host.70.1" - HDMI3_DAI_PIPELINE_SRC "copier.HDA.71.1" - HDMI4_HOST_PIPELINE_SINK "copier.host.80.1" - HDMI4_DAI_PIPELINE_SRC "copier.HDA.81.1" } diff --git a/tools/topology/topology2/platform/intel/hdmi-generic.conf b/tools/topology/topology2/platform/intel/hdmi-generic.conf index 4a8792751da8..545f4abeb5d9 100644 --- a/tools/topology/topology2/platform/intel/hdmi-generic.conf +++ b/tools/topology/topology2/platform/intel/hdmi-generic.conf @@ -66,13 +66,14 @@ Object.Pipeline { direction "playback" index $HDMI1_DAI_PIPELINE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { node_type $HDA_LINK_OUTPUT_CLASS stream_name "iDisp1" dai_type "HDA" copier_type "HDA" num_input_audio_formats 1 num_output_audio_formats 1 + num_input_pins 1 # copier only supports 32-bit 48KHz 2ch Object.Base.audio_format [ @@ -90,13 +91,14 @@ Object.Pipeline { direction "playback" index $HDMI2_DAI_PIPELINE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { node_type $HDA_LINK_OUTPUT_CLASS stream_name 'iDisp2' dai_type "HDA" copier_type "HDA" num_input_audio_formats 1 num_output_audio_formats 1 + num_input_pins 1 # copier only supports 32-bit 48KHz 2ch Object.Base.audio_format [ @@ -113,13 +115,14 @@ Object.Pipeline { { direction "playback" index $HDMI3_DAI_PIPELINE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { node_type $HDA_LINK_OUTPUT_CLASS stream_name 'iDisp3' dai_type "HDA" copier_type "HDA" num_input_audio_formats 1 num_output_audio_formats 1 + num_input_pins 1 # copier only supports 32-bit 48KHz 2ch Object.Base.audio_format [ @@ -182,15 +185,15 @@ Object.PCM.pcm [ Object.Base.route [ { source "host-copier.$HDMI1_PCM_ID.playback" - sink $HDMI1_DAI_PIPELINE_SRC + sink "dai-copier.HDA.iDisp1.playback" } { source "host-copier.$HDMI2_PCM_ID.playback" - sink $HDMI2_DAI_PIPELINE_SRC + sink "dai-copier.HDA.iDisp2.playback" } { source "host-copier.$HDMI3_PCM_ID.playback" - sink $HDMI3_DAI_PIPELINE_SRC + sink "dai-copier.HDA.iDisp3.playback" } ] @@ -214,13 +217,14 @@ IncludeByKey.NUM_HDMIS { direction "playback" index $HDMI4_DAI_PIPELINE_ID - Object.Widget.copier.1 { + Object.Widget.dai-copier.1 { node_type $HDA_LINK_OUTPUT_CLASS stream_name 'iDisp4' dai_type "HDA" copier_type "HDA" num_input_audio_formats 1 num_output_audio_formats 1 + num_input_pins 1 # copier only supports 32-bit 48KHz 2ch Object.Base.audio_format [ @@ -264,7 +268,7 @@ IncludeByKey.NUM_HDMIS { Object.Base.route [ { source "host-copier.$HDMI4_PCM_ID.playback" - sink $HDMI4_DAI_PIPELINE_SRC + sink "dai-copier.HDA.iDisp4.playback" } ] } diff --git a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf index 0fba6b61326f..17694d584c36 100644 --- a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf +++ b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf @@ -17,8 +17,9 @@ Object.Pipeline { dai-copier-be [ { index $ECHO_REF_DAI_PIPELINE_ID + direction "capture" - Object.Widget.copier."1" { + Object.Widget.dai-copier."1" { dai_index $SPEAKER_SSP_DAI_INDEX dai_type "SSP" type dai_out @@ -52,7 +53,7 @@ Object.PCM.pcm [ Object.Base.route [ { - source $ECHO_REF_DAI_PIPELINE_SRC + source "dai-copier.SSP.$SPEAKER_CODEC_NAME.capture" sink $ECHO_REF_COPIER_MODULE } { diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf index ca5bd6db9fab..37861e7b86df 100644 --- a/tools/topology/topology2/sof-hda-generic.conf +++ b/tools/topology/topology2/sof-hda-generic.conf @@ -45,7 +45,7 @@ Define { # doesn't it need to define DMIC0_HOST_PIPELINE_SINK and DMIC0_DAI_PIPELINE_SRC? DMIC0_HOST_PIPELINE_SINK 'gain.11.1' DMIC0_DAI_PIPELINE_SRC 'module-copier.12.2' - DMIC0_DAI_COPIER 'copier.DMIC.12.1' + DMIC0_DAI_COPIER 'dai-copier.DMIC.dmic01.capture' DMIC0_DAI_GAIN 'eqiir.12.1' DMIC0_DAI_EQIIR "highpass_40hz_20db" DMIC0_PCM_CAPS 'Gain Capture 11'