From 51f2b1fe8ea68e8baa4d5a03622e1e048af899c8 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 15 Mar 2022 20:43:15 -0500 Subject: [PATCH] topology2: cavs: cavs-mixin-mixout-hda: use macro for DAI name The copier 'stream_name' and dai 'name' need to match, use macro to enforce consistency. Signed-off-by: Pierre-Louis Bossart --- tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf b/tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf index 0f6b2c376..fb3772d55 100644 --- a/tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf +++ b/tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf @@ -1,11 +1,12 @@ Define { ANALOG_PLAYBACK_PCM 'Analog Playback' ANALOG_CAPTURE_PCM 'Analog Capture' + HDA_ANALOG_DAI_NAME 'Analog Playback and Capture' } Object.Dai { HDA.0 { - name 'Analog Playback and Capture' + name $HDA_ANALOG_DAI_NAME id 4 default_hw_conf_id 4 Object.Base.hw_config.HDA0 {} @@ -17,7 +18,7 @@ Object.Pipeline { index 2 Object.Widget.copier.1 { - stream_name 'Analog Playback and Capture' + stream_name $HDA_ANALOG_DAI_NAME dai_type "HDA" copier_type "HDA" } @@ -66,7 +67,7 @@ Object.Pipeline { index 4 Object.Widget.copier.1 { - stream_name 'Analog Playback and Capture' + stream_name $HDA_ANALOG_DAI_NAME dai_type "HDA" copier_type "HDA" }