From 82b7f6869fc76371db76462508117a77160544f5 Mon Sep 17 00:00:00 2001 From: Chao Song Date: Mon, 28 Aug 2023 16:07:46 +0800 Subject: [PATCH] topology2: align benchmark hda topology with other hda topology In this patch, audio_format is deprecated, and use input_audio_format/output_audio_format instead. Correct the IIR control bytes naming, and make it the same with other HDA topology. Signed-off-by: Chao Song --- .../topology2/cavs-benchmark-hda.conf | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tools/topology/topology2/cavs-benchmark-hda.conf b/tools/topology/topology2/cavs-benchmark-hda.conf index 0310b2c25..e47866791 100644 --- a/tools/topology/topology2/cavs-benchmark-hda.conf +++ b/tools/topology/topology2/cavs-benchmark-hda.conf @@ -106,16 +106,25 @@ Object.Pipeline { copier_type "HDA" stream_name $HDA_ANALOG_DAI_NAME node_type $HDA_LINK_INPUT_CLASS - Object.Base.audio_format.1 { - in_bit_depth 32 - in_valid_bit_depth 32 - out_bit_depth 32 - out_valid_bit_depth 32 - } + num_output_pins 1 + num_input_audio_formats 1 + num_output_audio_formats 1 + Object.Base.input_audio_format [ + { + in_bit_depth 32 + in_valid_bit_depth 32 + } + ] + Object.Base.output_audio_format [ + { + out_bit_depth 32 + out_valid_bit_depth 32 + } + ] } Object.Widget.eqiir.1 { Object.Control.bytes."1" { - name '4 Main capture Iir Eq' + name '$ANALOG_CAPTURE_PCM IIR Eq' } } }