From 6850be91ba481c1f26aa3e6b91dfb2c86fc4a914 Mon Sep 17 00:00:00 2001
From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Date: Thu, 12 Oct 2023 09:12:10 -0700
Subject: [PATCH] topology2: deepbuffer-playback: Replace audio_format objects

Use the input_audio_format/output_audio_format objects explicitly.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 .../pipelines/cavs/deepbuffer-playback.conf   | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf
index abe5a468a..f63f77ad1 100644
--- a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/host-copier.conf>
 <include/components/mixin.conf>
 <include/components/pipeline.conf>
@@ -47,28 +48,31 @@ Class.Pipeline."deepbuffer-playback" {
 			type	"aif_in"
 			node_type $HDA_HOST_OUTPUT_CLASS
 			num_input_audio_formats 3
-			num_output_audio_formats 3
+			num_output_audio_formats 1
 			num_output_pins 1
 			deep_buffer_dma_ms	$DEEPBUFFER_FW_DMA_MS
 			# 16-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		16
+					in_valid_bit_depth	16
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	24
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+			]
 			# 24-bit 48KHz 2ch
-			Object.Base.audio_format.2 {
-				in_bit_depth		32
-				in_valid_bit_depth	24
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
-			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.3 {
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		gain."1" {