From 719cb075f830bafefdf13f714dc2114735739046 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Fri, 31 Mar 2023 12:02:45 -0700 Subject: [PATCH] topology: mixout-gain-dai-copier-playback: Do not set default node_type It should be set when the pipeline is instantiated based on the DAI type. Signed-off-by: Ranjani Sridharan --- tools/topology/topology2/cavs-mixin-mixout-hda.conf | 1 + tools/topology/topology2/cavs-src-mixin-mixout-hda.conf | 1 + .../include/pipelines/cavs/mixout-gain-dai-copier-playback.conf | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/topology/topology2/cavs-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-hda.conf index b08226251..ecdb1e510 100644 --- a/tools/topology/topology2/cavs-mixin-mixout-hda.conf +++ b/tools/topology/topology2/cavs-mixin-mixout-hda.conf @@ -33,6 +33,7 @@ Object.Pipeline { index 2 Object.Widget.copier.1 { + node_type $HDA_LINK_OUTPUT_CLASS stream_name $HDA_ANALOG_DAI_NAME dai_type "HDA" copier_type "HDA" diff --git a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf index fcffeebcd..8068480ad 100644 --- a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf +++ b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf @@ -33,6 +33,7 @@ Object.Pipeline { index 2 Object.Widget.copier.1 { + node_type $HDA_LINK_OUTPUT_CLASS stream_name $HDA_ANALOG_DAI_NAME dai_type "HDA" copier_type "HDA" 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 5c7149712..6ff3115ff 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 @@ -48,7 +48,6 @@ Class.Pipeline."mixout-gain-dai-copier-playback" { mixout."1" {} copier."1" { type dai_in - node_type $HDA_LINK_OUTPUT_CLASS period_sink_count 0 period_source_count 2 num_audio_formats 2