From 96d7669a092dde32636e6f2b9ccc84b095e3cd65 Mon Sep 17 00:00:00 2001
From: Fred Oh <fred.oh@linux.intel.com>
Date: Mon, 18 Mar 2024 15:36:02 -0700
Subject: [PATCH] Revert "Tools: Topology2: Add IIR, FIR, DRC to HDA analog
 playback"

This is reverting SOF PR8934.
https://github.com/thesofproject/sof/pull/8934

This reverts commit 727ad8299780edba92c61b53f50047fa3a6aa82f.
---
 .../topology2/cavs-mixin-mixout-hda.conf      | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/tools/topology/topology2/cavs-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
index cf109a4b8d68..945f8670fb9c 100644
--- a/tools/topology/topology2/cavs-mixin-mixout-hda.conf
+++ b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
@@ -7,9 +7,6 @@ Define {
 	DEEP_BUFFER_PIPELINE_SRC	'mixin.15.1'
 	DEEP_BUFFER_PIPELINE_SINK	'mixout.2.1'
 	DEEP_BUFFER_PCM_NAME		'Deepbuffer HDA Analog'
-	EFX_FIR_PARAMS			'passthrough'
-	EFX_IIR_PARAMS			'passthrough'
-	EFX_DRC_PARAMS			'passthrough'
 }
 
 # include deep buffer config if buffer size is in 1 - 1000 ms.
@@ -31,7 +28,7 @@ Object.Dai.HDA [
 ]
 
 Object.Pipeline {
-	mixout-gain-efx-dai-copier-playback [
+	mixout-gain-dai-copier-playback [
 		{
 			index 2
 
@@ -46,26 +43,6 @@ Object.Pipeline {
 					name 'Post Mixer $ANALOG_PLAYBACK_PCM Volume'
 				}
 			}
-			Object.Widget.eqiir.1 {
-				Object.Control.bytes."1" {
-					name 'Post Mixer $ANALOG_PLAYBACK_PCM IIR Eq bytes'
-				}
-			}
-			Object.Widget.eqfir.1 {
-				Object.Control.bytes."1" {
-					name 'Post Mixer $ANALOG_PLAYBACK_PCM FIR Eq bytes'
-				}
-			}
-			Object.Widget.drc.1 {
-				Object.Control {
-					bytes."1" {
-						name 'Post Mixer $ANALOG_PLAYBACK_PCM DRC bytes'
-					}
-					mixer."1" {
-						name 'Post Mixer $ANALOG_PLAYBACK_PCM DRC switch'
-					}
-				}
-			}
 		}
 	]
 
@@ -156,7 +133,7 @@ Object.PCM.pcm [
 Object.Base.route [
 	{
 		sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback'
-		source 'drc.2.1'
+		source 'gain.2.1'
 	}
 	{
 		source 'mixin.1.1'