From 8cb7bf1baf15fdf20ac2cdca28d1349281a05978 Mon Sep 17 00:00:00 2001
From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Date: Wed, 7 Jun 2023 17:56:13 -0700
Subject: [PATCH] topology2: cavs-mixin-mixout: Replace audio_format instance

Use the input_audio_format and output_audio_format objects instead
and fix the number of input/output formats to 1.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 .../topology2/cavs-mixin-mixout-efx-hda.conf  | 20 ++++++++++++------
 .../topology2/cavs-mixin-mixout-hda.conf      | 21 +++++++++++++------
 .../topology2/cavs-src-mixin-mixout-hda.conf  | 20 ++++++++++++------
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
index 6b39c1e42..a37b8fc58 100644
--- a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
+++ b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
@@ -95,12 +95,20 @@ Object.Pipeline {
 				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
-					out_bit_depth		32
-					out_valid_bit_depth	32
-				}
+				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
+					}
+				]
 			}
 		}
 	]
diff --git a/tools/topology/topology2/cavs-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
index 7ec84fc80..8e5dc10eb 100644
--- a/tools/topology/topology2/cavs-mixin-mixout-hda.conf
+++ b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
@@ -84,12 +84,21 @@ 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" {
diff --git a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf
index 854dfb4ea..b567e5f81 100644
--- a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf
+++ b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf
@@ -88,12 +88,20 @@ Object.Pipeline {
 				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
-					out_bit_depth		32
-					out_valid_bit_depth	32
-				}
+				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
+					}
+				]
 			}
 		}
 	]