diff --git a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
index 4a31d27dd740..6ec813d8e525 100644
--- a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
+++ b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
@@ -7,6 +7,15 @@ Define {
 	DEEP_BUFFER_PIPELINE_SRC	'mixin.15.1'
 	DEEP_BUFFER_PIPELINE_SINK	'mixout.2.1'
 	DEEP_BUFFER_PCM_NAME		'Deepbuffer HDA Analog'
+	HDA_ANALOG_CAPTURE_RATE		48000
+	HDA_ANALOG_PLAYBACK_RATE	48000
+        HDA_MIC_ENHANCED_CAPTURE        'false'
+        HDA_MIC_TDFB_PCM_ID         201
+        HDA_MIC_TDFB_PCM_NAME           'Analog Enhanced Audio'
+        HDA_MIC_TDFB_HOST_PIPELINE_ID   23
+        HDA_MIC_TDFB_HOST_PIPELINE_SINK 'copier.host.23.1'
+        HDA_MIC_TDFB_PCM_CAPS           'Enhanced Audio Capture 23'
+        HDA_MIC_DAI_PIPELINE_SRC        'module-copier.4.2'
 }
 
 # include deep buffer config if buffer size is in 1 - 1000 ms.
@@ -136,13 +145,12 @@ Object.Pipeline {
 		}
 	]
 
-	io-gateway [
+	dai-copier-eqiir-module-copier-capture [
 		{
 			index		4
-			direction	capture
 
 			Object.Widget.dai-copier."1" {
-				dai_type 	"HDA"
+				dai_type	"HDA"
 				type		"dai_out"
 				copier_type	"HDA"
 				stream_name	$HDA_ANALOG_DAI_NAME
@@ -152,17 +160,60 @@ Object.Pipeline {
 				num_output_audio_formats 1
 				Object.Base.input_audio_format [
 					{
+						in_rate			$HDA_ANALOG_CAPTURE_RATE
 						in_bit_depth		32
 						in_valid_bit_depth	32
 					}
 				]
 				Object.Base.output_audio_format [
 					{
+						out_rate		$HDA_ANALOG_CAPTURE_RATE
 						out_bit_depth		32
 						out_valid_bit_depth	32
 					}
 				]
 			}
+			Object.Widget.eqiir.1 {
+				Object.Control.bytes."1" {
+					name '$ANALOG_CAPTURE_PCM IIR Eq'
+					<include/components/eqiir/highpass_40hz_0db_48khz.conf>
+				}
+				num_input_audio_formats 1
+				num_output_audio_formats 1
+				Object.Base.input_audio_format [
+					{
+						in_rate			$HDA_ANALOG_CAPTURE_RATE
+						in_bit_depth		32
+						in_valid_bit_depth	32
+					}
+				]
+				Object.Base.output_audio_format [
+					{
+						out_rate		$HDA_ANALOG_CAPTURE_RATE
+						out_bit_depth		32
+						out_valid_bit_depth	32
+					}
+				]
+			}
+			Object.Widget.module-copier."2" {
+				stream_name $HDA_ANALOG_DAI_NAME
+				num_input_audio_formats 1
+				num_output_audio_formats 1
+				Object.Base.input_audio_format [
+					{
+						in_rate			$HDA_ANALOG_CAPTURE_RATE
+						in_bit_depth		32
+						in_valid_bit_depth	32
+					}
+				]
+				Object.Base.output_audio_format [
+					{
+						out_rate		$HDA_ANALOG_CAPTURE_RATE
+						out_bit_depth		32
+						out_valid_bit_depth	32
+					}
+				]
+                        }
 		}
 	]
 }
@@ -201,6 +252,10 @@ IncludeByKey.EFX_DRC_COMPONENT {
                         }
                         {
                                 source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture'
+                                sink 'eqiir.4.1'
+                        }
+                        {
+                                source 'module-copier.4.2'
                                 sink 'host-copier.0.capture'
                         }
                         {
@@ -221,6 +276,10 @@ IncludeByKey.EFX_DRC_COMPONENT {
                         }
                         {
                                 source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture'
+                                sink 'eqiir.4.1'
+                        }
+                        {
+                                source 'module-copier.4.2'
                                 sink 'host-copier.0.capture'
                         }
                         {
@@ -230,3 +289,7 @@ IncludeByKey.EFX_DRC_COMPONENT {
                 ]
         }
 }
+
+IncludeByKey.HDA_MIC_ENHANCED_CAPTURE {
+        "true"	"platform/intel/hda-enhanced-capture.conf"
+}
diff --git a/tools/topology/topology2/cavs-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
index 6ae9a3515e29..986ea62dddbe 100644
--- a/tools/topology/topology2/cavs-mixin-mixout-hda.conf
+++ b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
@@ -198,10 +198,9 @@ Object.Pipeline {
 		}
 	]
 
-	highpass-capture-be [
+	dai-copier-eqiir-module-copier-capture [
 		{
 			index		4
-			direction	capture
 
 			Object.Widget.dai-copier."1" {
 				dai_type 	"HDA"
@@ -230,8 +229,44 @@ Object.Pipeline {
 			Object.Widget.eqiir.1 {
 				Object.Control.bytes."1" {
 					name '$ANALOG_CAPTURE_PCM IIR Eq'
+                                        <include/components/eqiir/highpass_40hz_0db_48khz.conf>
 				}
+				num_input_audio_formats 1
+				num_output_audio_formats 1
+				Object.Base.input_audio_format [
+					{
+						in_rate			$HDA_ANALOG_CAPTURE_RATE
+						in_bit_depth		32
+						in_valid_bit_depth	32
+					}
+				]
+				Object.Base.output_audio_format [
+					{
+						out_rate		$HDA_ANALOG_CAPTURE_RATE
+						out_bit_depth		32
+						out_valid_bit_depth	32
+					}
+				]
 			}
+                        Object.Widget.module-copier."2" {
+                                stream_name $HDA_ANALOG_DAI_NAME
+				num_input_audio_formats 1
+				num_output_audio_formats 1
+				Object.Base.input_audio_format [
+					{
+						in_rate			$HDA_ANALOG_CAPTURE_RATE
+						in_bit_depth		32
+						in_valid_bit_depth	32
+					}
+				]
+				Object.Base.output_audio_format [
+					{
+						out_rate		$HDA_ANALOG_CAPTURE_RATE
+						out_bit_depth		32
+						out_valid_bit_depth	32
+					}
+				]
+                        }
 		}
 	]
 }
@@ -275,7 +310,7 @@ Object.Base.route [
 		sink 'eqiir.4.1'
 	}
 	{
-		source 'eqiir.4.1'
+		source 'module-copier.4.2'
 		sink 'host-copier.0.capture'
 	}
 	{
diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf
index c017252201ac..a81b7de39ad7 100644
--- a/tools/topology/topology2/cavs-nocodec.conf
+++ b/tools/topology/topology2/cavs-nocodec.conf
@@ -23,7 +23,7 @@
 <mixout-gain-dai-copier-playback.conf>
 <mixout-gain-smart-amp-dai-copier-playback.conf>
 <dai-copier-gain-module-copier-capture.conf>
-<dai-copier-eqiir-module-copier-capture.conf>
+<dai-copier-eqiir-gain-module-copier-capture.conf>
 <gain-module-copier.conf>
 <gain-capture.conf>
 <gain-copier-capture.conf>
@@ -57,10 +57,9 @@ Define {
 	# override DMIC default definitions
 	DMIC0_HOST_PIPELINE_ID		13
 	DMIC0_DAI_PIPELINE_ID		14
-	DMIC0_HOST_PIPELINE_SINK	'gain.13.1'
+	DMIC0_HOST_PIPELINE_SINK	'host-copier.10.capture'
 	DMIC0_DAI_PIPELINE_SRC		'module-copier.14.2'
 	DMIC0_DAI_COPIER		'dai-copier.DMIC.NoCodec-6.capture'
-	DMIC0_DAI_GAIN			'eqiir.14.1'
 	DMIC0_NAME			'NoCodec-6'
 	DMIC1_NAME			'NoCodec-7'
 	DMIC0_PCM_CAPS			'Gain Capture 13'
diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
index 8c8c72a208be..6dea47f0c198 100644
--- a/tools/topology/topology2/cavs-rt5682.conf
+++ b/tools/topology/topology2/cavs-rt5682.conf
@@ -21,7 +21,7 @@
 <mixout-gain-eqiir-dts-dai-copier-playback.conf>
 <deepbuffer-playback.conf>
 <dai-copier-be.conf>
-<dai-copier-eqiir-module-copier-capture.conf>
+<dai-copier-eqiir-gain-module-copier-capture.conf>
 <gain-capture.conf>
 <gain-module-copier.conf>
 <google-rtc-aec-capture.conf>
@@ -57,10 +57,9 @@ Define {
 	DMIC1_ID			2
 	DMIC0_HOST_PIPELINE_ID		13
 	DMIC0_DAI_PIPELINE_ID		14
-	DMIC0_HOST_PIPELINE_SINK	'gain.13.1'
+	DMIC0_HOST_PIPELINE_SINK	'host-copier.99.capture'
 	DMIC0_DAI_PIPELINE_SRC		'module-copier.14.2'
 	DMIC0_DAI_COPIER		'dai-copier.DMIC.dmic01.capture'
-	DMIC0_DAI_GAIN			'eqiir.14.1'
 	DMIC0_NAME			'dmic01'
 	DMIC0_PCM_CAPS			'Gain Capture 13'
 	# override BE link ids
diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf
index 12215b7cdb17..4f3e3f7a065c 100644
--- a/tools/topology/topology2/cavs-sdw.conf
+++ b/tools/topology/topology2/cavs-sdw.conf
@@ -13,7 +13,7 @@
 <virtual.conf>
 <host-copier-gain-mixin-playback.conf>
 <mixout-gain-alh-dai-copier-playback.conf>
-<dai-copier-eqiir-module-copier-capture.conf>
+<dai-copier-eqiir-gain-module-copier-capture.conf>
 <gain-capture.conf>
 <gain-copier-capture.conf>
 <deepbuffer-playback.conf>
@@ -56,10 +56,9 @@ Define {
 	PDM1_MIC_B_ENABLE 1
 	DMIC0_HOST_PIPELINE_ID 100
 	DMIC0_DAI_PIPELINE_ID 101
-	DMIC0_HOST_PIPELINE_SINK 'gain.100.1'
+	DMIC0_HOST_PIPELINE_SINK 'host-copier.10.capture'
 	DMIC0_DAI_PIPELINE_SRC 'module-copier.101.2'
 	DMIC0_DAI_COPIER 'dai-copier.DMIC.dmic01.capture'
-	DMIC0_DAI_GAIN 'eqiir.101.1'
 	DMIC0_NAME 'dmic01'
 	DMIC0_ID 4
 	DMIC1_ID 5
diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake
index 55bda70dec91..4f856ac80c36 100644
--- a/tools/topology/topology2/development/tplg-targets.cmake
+++ b/tools/topology/topology2/development/tplg-targets.cmake
@@ -56,18 +56,19 @@ NHLT_BIN=nhlt-sof-lnl-nocodec-fpga-4ch.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000
 "cavs-sdw\;sof-lnl-fpga-rt711-l0\;PLATFORM=lnl,NUM_HDMIS=0,PASSTHROUGH=true"
 
 # CAVS HDA topology with mixer-based efx eq pipelines for HDA and passthrough pipelines for HDMI
-"sof-hda-generic\;sof-hda-efx-generic\;HDA_CONFIG=efx,\
-EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,EFX_DRC_PARAMS=passthrough"
+"sof-hda-generic\;sof-hda-efx-generic\;HDA_CONFIG=efx,HDA_MIC_ENHANCED_CAPTURE=true,\
+EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,EFX_DRC_PARAMS=passthrough,\
+EFX_HDA_MIC_TDFB_PARAMS=line2_generic_pm10deg,EFX_HDA_MIC_DRC_PARAMS=passthrough"
 
 "sof-hda-generic\;sof-hda-efx-generic-2ch\;\
 HDA_CONFIG=efx,NUM_DMICS=2,\
-EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
-EFX_DRC_PARAMS=passthrough"
+EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,EFX_DRC_PARAMS=passthrough,\
+DMIC0_ENHANCED_CAPTURE=true,EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,EFX_DMIC0_DRC_PARAMS=dmic_default"
 
 "sof-hda-generic\;sof-hda-efx-generic-4ch\;\
 HDA_CONFIG=efx,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
-EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
-EFX_DRC_PARAMS=passthrough"
+EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,EFX_DRC_PARAMS=passthrough,\
+DMIC0_ENHANCED_CAPTURE=true,EFX_DMIC0_TDFB_PARAMS=line4_generic_pm10deg,EFX_DMIC0_DRC_PARAMS=dmic_default"
 
 "sof-hda-generic\;sof-hda-efx-mbdrc-generic\;HDA_CONFIG=efx,\
 EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
diff --git a/tools/topology/topology2/include/components/drc/generic_notebook_speaker.conf b/tools/topology/topology2/include/components/drc/dmic_default.conf
similarity index 70%
rename from tools/topology/topology2/include/components/drc/generic_notebook_speaker.conf
rename to tools/topology/topology2/include/components/drc/dmic_default.conf
index 2730f659a3f9..af2cbc73e3cc 100644
--- a/tools/topology/topology2/include/components/drc/generic_notebook_speaker.conf
+++ b/tools/topology/topology2/include/components/drc/dmic_default.conf
@@ -1,4 +1,4 @@
-# Exported with script example_drc.m 18-Dec-2023
+# Exported with script example_drc.m 17-May-2024
 # cd tools/tune/drc; octave --no-window-system example_drc.m
 Object.Base.data."drc_config" {
 	bytes "
@@ -9,12 +9,12 @@ Object.Base.data."drc_config" {
 		0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 		0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
-		0x00,0x00,0x00,0xe7,0x00,0x00,0x00,0x0f,
+		0x00,0x00,0x00,0xdd,0x00,0x00,0x00,0x19,
 		0x00,0x00,0x00,0x0a,0xd3,0x4d,0x62,0x00,
-		0x0c,0x57,0x99,0x03,0x66,0x66,0x66,0x06,
-		0x5c,0xea,0xc1,0x00,0xbf,0x84,0x23,0x00,
-		0x03,0x3e,0xd6,0xff,0x4e,0xf4,0x50,0x00,
-		0xb6,0xa0,0xb5,0x09,0x4c,0x10,0x61,0x04,
+		0x72,0x5a,0x23,0x01,0x66,0x66,0x66,0x06,
+		0xd7,0x18,0xb8,0x00,0x31,0xcd,0x1a,0x00,
+		0x04,0xb3,0xe4,0xff,0x4e,0xf4,0x50,0x00,
+		0xf1,0x0d,0x51,0x07,0x9a,0x81,0xac,0x03,
 		0x1c,0xc7,0x71,0x00,0x77,0x77,0x77,0xff,
 		0xd8,0x77,0x1f,0x00,0x05,0x00,0x00,0x00,
 		0x00,0x80,0x43,0x00,0xd7,0x7d,0x04,0x00,
diff --git a/tools/topology/topology2/include/components/drc/speaker_default.conf b/tools/topology/topology2/include/components/drc/speaker_default.conf
new file mode 100644
index 000000000000..abd9d47a5680
--- /dev/null
+++ b/tools/topology/topology2/include/components/drc/speaker_default.conf
@@ -0,0 +1,23 @@
+# Exported with script example_drc.m 17-May-2024
+# cd tools/tune/drc; octave --no-window-system example_drc.m
+Object.Base.data."drc_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x00,0x00,0x00,0x00,
+		0x6c,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
+		0x00,0x00,0x00,0xe2,0x00,0x00,0x00,0x14,
+		0x00,0x00,0x00,0x0a,0xd3,0x4d,0x62,0x00,
+		0x8a,0x1b,0x06,0x02,0x66,0x66,0x66,0x06,
+		0x2f,0x97,0xba,0x00,0x18,0x0c,0x1e,0x00,
+		0x20,0x42,0xe0,0xff,0x4e,0xf4,0x50,0x00,
+		0x9a,0x9f,0x34,0x08,0xd3,0x2c,0xd8,0x04,
+		0x1c,0xc7,0x71,0x00,0x77,0x77,0x77,0xff,
+		0xd8,0x77,0x1f,0x00,0x05,0x00,0x00,0x00,
+		0x00,0x80,0x43,0x00,0xd7,0x7d,0x04,0x00,
+		0xa0,0xce,0x25,0x00,0xd7,0x7d,0x09,0x00,
+		0xb1,0xb5,0x00,0x00"
+}
diff --git a/tools/topology/topology2/include/components/tdfb/line2_generic_pm10deg_16khz.conf b/tools/topology/topology2/include/components/tdfb/line2_generic_pm10deg_16khz.conf
new file mode 100644
index 000000000000..c8bd09d172ed
--- /dev/null
+++ b/tools/topology/topology2/include/components/tdfb/line2_generic_pm10deg_16khz.conf
@@ -0,0 +1,108 @@
+# Created with script example_two_beams_default.m 17-May-2024
+# cd tools/tune/tdfb; matlab -nodisplay -nosplash -nodesktop -r example_two_beams_default
+Object.Base.data."tdfb_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x00,0x00,0x00,0x00,
+		0x14,0x03,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x14,0x03,0x00,0x00,0x04,0x00,0x02,0x00,
+		0x01,0x00,0x02,0x00,0x01,0x00,0x01,0x00,
+		0x00,0x00,0x0f,0x00,0xa6,0xff,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x40,0x00,0x01,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0xec,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x40,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
+		0xfd,0xff,0x08,0x00,0xf2,0xff,0x17,0x00,
+		0xde,0xff,0x2f,0x00,0xc0,0xff,0x53,0x00,
+		0x97,0xff,0x83,0x00,0x5f,0xff,0xc3,0x00,
+		0x16,0xff,0x16,0x01,0xb9,0xfe,0x80,0x01,
+		0x40,0xfe,0x0a,0x02,0xa2,0xfd,0xc1,0x02,
+		0xc9,0xfc,0xc3,0x03,0x8f,0xfb,0x4e,0x05,
+		0x8d,0xf9,0x0e,0x08,0x7f,0xf5,0xc6,0x0e,
+		0xb9,0xe7,0x69,0x41,0x18,0x60,0x70,0xe4,
+		0xf1,0x0f,0xe9,0xf4,0x67,0x08,0x53,0xf9,
+		0x76,0x05,0x72,0xfb,0xd9,0x03,0xb9,0xfc,
+		0xce,0x02,0x97,0xfd,0x12,0x02,0x3a,0xfe,
+		0x85,0x01,0xb5,0xfe,0x19,0x01,0x14,0xff,
+		0xc5,0x00,0x5d,0xff,0x85,0x00,0x96,0xff,
+		0x54,0x00,0xc0,0xff,0x30,0x00,0xde,0xff,
+		0x17,0x00,0xf2,0xff,0x08,0x00,0xfd,0xff,
+		0x01,0x00,0x00,0x00,0x40,0x00,0x01,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x01,0x00,0xfd,0xff,0x08,0x00,
+		0xf2,0xff,0x17,0x00,0xde,0xff,0x2f,0x00,
+		0xc0,0xff,0x53,0x00,0x97,0xff,0x83,0x00,
+		0x5f,0xff,0xc3,0x00,0x16,0xff,0x16,0x01,
+		0xb9,0xfe,0x80,0x01,0x40,0xfe,0x0a,0x02,
+		0xa2,0xfd,0xc1,0x02,0xc9,0xfc,0xc3,0x03,
+		0x8f,0xfb,0x4e,0x05,0x8d,0xf9,0x0e,0x08,
+		0x7f,0xf5,0xc6,0x0e,0xb9,0xe7,0x69,0x41,
+		0x18,0x60,0x70,0xe4,0xf1,0x0f,0xe9,0xf4,
+		0x67,0x08,0x53,0xf9,0x76,0x05,0x72,0xfb,
+		0xd9,0x03,0xb9,0xfc,0xce,0x02,0x97,0xfd,
+		0x12,0x02,0x3a,0xfe,0x85,0x01,0xb5,0xfe,
+		0x19,0x01,0x14,0xff,0xc5,0x00,0x5d,0xff,
+		0x85,0x00,0x96,0xff,0x54,0x00,0xc0,0xff,
+		0x30,0x00,0xde,0xff,0x17,0x00,0xf2,0xff,
+		0x08,0x00,0xfd,0xff,0x01,0x00,0x00,0x00,
+		0x40,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0xec,0x7f,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
+		0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+		0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x01,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x9a,0xff,
+		0x00,0x00,0x00,0x00"
+}
diff --git a/tools/topology/topology2/include/components/tdfb/line2_generic_pm10deg_48khz.conf b/tools/topology/topology2/include/components/tdfb/line2_generic_pm10deg_48khz.conf
new file mode 100644
index 000000000000..86f6f1012ba7
--- /dev/null
+++ b/tools/topology/topology2/include/components/tdfb/line2_generic_pm10deg_48khz.conf
@@ -0,0 +1,108 @@
+# Created with script example_two_beams_default.m 17-May-2024
+# cd tools/tune/tdfb; matlab -nodisplay -nosplash -nodesktop -r example_two_beams_default
+Object.Base.data."tdfb_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x00,0x00,0x00,0x00,
+		0x14,0x03,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x14,0x03,0x00,0x00,0x04,0x00,0x02,0x00,
+		0x01,0x00,0x02,0x00,0x01,0x00,0x01,0x00,
+		0x00,0x00,0x0f,0x00,0xa6,0xff,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x40,0x00,0x01,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0xec,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x40,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
+		0x02,0x00,0xfb,0xff,0x0a,0x00,0xf1,0xff,
+		0x17,0x00,0xe0,0xff,0x2b,0x00,0xc8,0xff,
+		0x48,0x00,0xa6,0xff,0x6e,0x00,0x7a,0xff,
+		0xa0,0x00,0x41,0xff,0xe2,0x00,0xf6,0xfe,
+		0x38,0x01,0x93,0xfe,0xab,0x01,0x0c,0xfe,
+		0x4c,0x02,0x48,0xfd,0x41,0x03,0x0b,0xfc,
+		0xef,0x04,0x9a,0xf9,0xdf,0x08,0xf3,0xf1,
+		0x46,0x20,0x69,0x76,0x0c,0xeb,0x70,0x0b,
+		0x33,0xf8,0xdd,0x05,0x5b,0xfb,0xcc,0x03,
+		0xd4,0xfc,0xb0,0x02,0xb4,0xfd,0xf9,0x01,
+		0x4c,0xfe,0x79,0x01,0xbb,0xfe,0x18,0x01,
+		0x0f,0xff,0xce,0x00,0x51,0xff,0x94,0x00,
+		0x84,0xff,0x66,0x00,0xad,0xff,0x43,0x00,
+		0xcb,0xff,0x29,0x00,0xe2,0xff,0x16,0x00,
+		0xf1,0xff,0x09,0x00,0xfb,0xff,0x02,0x00,
+		0xff,0xff,0x00,0x00,0x40,0x00,0x01,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0xff,0xff,0x02,0x00,0xfb,0xff,
+		0x0a,0x00,0xf1,0xff,0x17,0x00,0xe0,0xff,
+		0x2b,0x00,0xc8,0xff,0x48,0x00,0xa6,0xff,
+		0x6e,0x00,0x7a,0xff,0xa0,0x00,0x41,0xff,
+		0xe2,0x00,0xf6,0xfe,0x38,0x01,0x93,0xfe,
+		0xab,0x01,0x0c,0xfe,0x4c,0x02,0x48,0xfd,
+		0x41,0x03,0x0b,0xfc,0xef,0x04,0x9a,0xf9,
+		0xdf,0x08,0xf3,0xf1,0x46,0x20,0x69,0x76,
+		0x0c,0xeb,0x70,0x0b,0x33,0xf8,0xdd,0x05,
+		0x5b,0xfb,0xcc,0x03,0xd4,0xfc,0xb0,0x02,
+		0xb4,0xfd,0xf9,0x01,0x4c,0xfe,0x79,0x01,
+		0xbb,0xfe,0x18,0x01,0x0f,0xff,0xce,0x00,
+		0x51,0xff,0x94,0x00,0x84,0xff,0x66,0x00,
+		0xad,0xff,0x43,0x00,0xcb,0xff,0x29,0x00,
+		0xe2,0xff,0x16,0x00,0xf1,0xff,0x09,0x00,
+		0xfb,0xff,0x02,0x00,0xff,0xff,0x00,0x00,
+		0x40,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0xec,0x7f,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
+		0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+		0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x01,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x9a,0xff,
+		0x00,0x00,0x00,0x00"
+}
diff --git a/tools/topology/topology2/include/components/tdfb/line2_pass.conf b/tools/topology/topology2/include/components/tdfb/line2_pass.conf
index 4e83bb50c401..08d6ec3ee7bc 100644
--- a/tools/topology/topology2/include/components/tdfb/line2_pass.conf
+++ b/tools/topology/topology2/include/components/tdfb/line2_pass.conf
@@ -1,14 +1,22 @@
-# Exported with script example_pass_config.m 23-Oct-2023
+# Exported with script example_pass_config.m 13-May-2024
 # cd tools/tune/tdfb; octave --no-window-system example_pass_config.m
 Object.Base.data."tdfb_config" {
 	bytes "
 		0x53,0x4f,0x46,0x34,0x00,0x00,0x00,0x00,
-		0x28,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x68,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
 		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x28,0x00,0x00,0x00,0x02,0x00,0x02,0x00,
-		0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x68,0x00,0x00,0x00,0x02,0x00,0x02,0x00,
+		0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
 		0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
 		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
-		0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00"
+		0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00"
 }
diff --git a/tools/topology/topology2/include/components/tdfb/line4_generic_pm10deg_16khz.conf b/tools/topology/topology2/include/components/tdfb/line4_generic_pm10deg_16khz.conf
new file mode 100644
index 000000000000..ff71a228821c
--- /dev/null
+++ b/tools/topology/topology2/include/components/tdfb/line4_generic_pm10deg_16khz.conf
@@ -0,0 +1,202 @@
+# Created with script example_two_beams_default.m 17-May-2024
+# cd tools/tune/tdfb; matlab -nodisplay -nosplash -nodesktop -r example_two_beams_default
+Object.Base.data."tdfb_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x00,0x00,0x00,0x00,
+		0x04,0x06,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x06,0x00,0x00,0x08,0x00,0x02,0x00,
+		0x01,0x00,0x04,0x00,0x01,0x00,0x01,0x00,
+		0x00,0x00,0x0f,0x00,0xa6,0xff,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x40,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0xec,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x40,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
+		0xfd,0xff,0x07,0x00,0xf4,0xff,0x14,0x00,
+		0xe3,0xff,0x29,0x00,0xc9,0xff,0x47,0x00,
+		0xa5,0xff,0x71,0x00,0x75,0xff,0xa8,0x00,
+		0x37,0xff,0xef,0x00,0xe7,0xfe,0x4a,0x01,
+		0x7f,0xfe,0xbf,0x01,0xf8,0xfd,0x5c,0x02,
+		0x40,0xfd,0x38,0x03,0x35,0xfc,0x85,0x04,
+		0x85,0xfa,0xd2,0x06,0x27,0xf7,0x51,0x0c,
+		0x33,0xec,0xb8,0x30,0xb2,0x6c,0x70,0xe6,
+		0x5a,0x0e,0x23,0xf6,0x6d,0x07,0x20,0xfa,
+		0xcb,0x04,0x03,0xfc,0x5d,0x03,0x23,0xfd,
+		0x73,0x02,0xe7,0xfd,0xcd,0x01,0x74,0xfe,
+		0x52,0x01,0xe0,0xfe,0xf4,0x00,0x32,0xff,
+		0xab,0x00,0x73,0xff,0x73,0x00,0xa4,0xff,
+		0x49,0x00,0xc8,0xff,0x29,0x00,0xe2,0xff,
+		0x14,0x00,0xf4,0xff,0x07,0x00,0xfd,0xff,
+		0x01,0x00,0x00,0x00,0x40,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x01,0x00,0xfd,0xff,0x07,0x00,
+		0xf2,0xff,0x16,0x00,0xdf,0xff,0x2e,0x00,
+		0xc3,0xff,0x50,0x00,0x9a,0xff,0x7f,0x00,
+		0x64,0xff,0xbd,0x00,0x1e,0xff,0x0d,0x01,
+		0xc3,0xfe,0x75,0x01,0x4d,0xfe,0xfc,0x01,
+		0xb1,0xfd,0xb1,0x02,0xdb,0xfc,0xb2,0x03,
+		0xa0,0xfb,0x40,0x05,0x93,0xf9,0x1a,0x08,
+		0x48,0xf5,0x7b,0x0f,0xec,0xe4,0x79,0x65,
+		0xb4,0x3a,0x59,0xe9,0xe9,0x0d,0x11,0xf6,
+		0xa2,0x07,0xe1,0xf9,0x0a,0x05,0xc7,0xfb,
+		0x95,0x03,0xf1,0xfc,0xa0,0x02,0xbe,0xfd,
+		0xf1,0x01,0x55,0xfe,0x6e,0x01,0xc8,0xfe,
+		0x09,0x01,0x21,0xff,0xba,0x00,0x66,0xff,
+		0x7d,0x00,0x9b,0xff,0x4f,0x00,0xc3,0xff,
+		0x2d,0x00,0xe0,0xff,0x16,0x00,0xf2,0xff,
+		0x07,0x00,0xfd,0xff,0x01,0x00,0x00,0x00,
+		0x40,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x01,0x00,0xff,0xff,0x02,0x00,
+		0xfd,0xff,0x04,0x00,0xfa,0xff,0x08,0x00,
+		0xf6,0xff,0x0c,0x00,0xf1,0xff,0x13,0x00,
+		0xea,0xff,0x1a,0x00,0xe1,0xff,0x25,0x00,
+		0xd5,0xff,0x32,0x00,0xc5,0xff,0x45,0x00,
+		0xb0,0xff,0x5f,0x00,0x8f,0xff,0x89,0x00,
+		0x57,0xff,0xd9,0x00,0xda,0xfe,0xbe,0x01,
+		0x88,0xfc,0xc1,0x7f,0xb0,0x03,0x31,0xfe,
+		0x30,0x01,0x20,0xff,0xaf,0x00,0x72,0xff,
+		0x76,0x00,0x9c,0xff,0x55,0x00,0xb7,0xff,
+		0x3f,0x00,0xca,0xff,0x2f,0x00,0xd8,0xff,
+		0x22,0x00,0xe3,0xff,0x19,0x00,0xeb,0xff,
+		0x12,0x00,0xf1,0xff,0x0c,0x00,0xf6,0xff,
+		0x08,0x00,0xfa,0xff,0x04,0x00,0xfd,0xff,
+		0x02,0x00,0xff,0xff,0x01,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x40,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
+		0xff,0xff,0x02,0x00,0xfd,0xff,0x04,0x00,
+		0xfa,0xff,0x08,0x00,0xf6,0xff,0x0c,0x00,
+		0xf1,0xff,0x13,0x00,0xea,0xff,0x1a,0x00,
+		0xe1,0xff,0x25,0x00,0xd5,0xff,0x32,0x00,
+		0xc5,0xff,0x45,0x00,0xb0,0xff,0x5f,0x00,
+		0x8f,0xff,0x89,0x00,0x57,0xff,0xd9,0x00,
+		0xda,0xfe,0xbe,0x01,0x88,0xfc,0xc1,0x7f,
+		0xb0,0x03,0x31,0xfe,0x30,0x01,0x20,0xff,
+		0xaf,0x00,0x72,0xff,0x76,0x00,0x9c,0xff,
+		0x55,0x00,0xb7,0xff,0x3f,0x00,0xca,0xff,
+		0x2f,0x00,0xd8,0xff,0x22,0x00,0xe3,0xff,
+		0x19,0x00,0xeb,0xff,0x12,0x00,0xf1,0xff,
+		0x0c,0x00,0xf6,0xff,0x08,0x00,0xfa,0xff,
+		0x04,0x00,0xfd,0xff,0x02,0x00,0xff,0xff,
+		0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x40,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
+		0xfd,0xff,0x07,0x00,0xf2,0xff,0x16,0x00,
+		0xdf,0xff,0x2e,0x00,0xc3,0xff,0x50,0x00,
+		0x9a,0xff,0x7f,0x00,0x64,0xff,0xbd,0x00,
+		0x1e,0xff,0x0d,0x01,0xc3,0xfe,0x75,0x01,
+		0x4d,0xfe,0xfc,0x01,0xb1,0xfd,0xb1,0x02,
+		0xdb,0xfc,0xb2,0x03,0xa0,0xfb,0x40,0x05,
+		0x93,0xf9,0x1a,0x08,0x48,0xf5,0x7b,0x0f,
+		0xec,0xe4,0x79,0x65,0xb4,0x3a,0x59,0xe9,
+		0xe9,0x0d,0x11,0xf6,0xa2,0x07,0xe1,0xf9,
+		0x0a,0x05,0xc7,0xfb,0x95,0x03,0xf1,0xfc,
+		0xa0,0x02,0xbe,0xfd,0xf1,0x01,0x55,0xfe,
+		0x6e,0x01,0xc8,0xfe,0x09,0x01,0x21,0xff,
+		0xba,0x00,0x66,0xff,0x7d,0x00,0x9b,0xff,
+		0x4f,0x00,0xc3,0xff,0x2d,0x00,0xe0,0xff,
+		0x16,0x00,0xf2,0xff,0x07,0x00,0xfd,0xff,
+		0x01,0x00,0x00,0x00,0x40,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x01,0x00,0xfd,0xff,0x07,0x00,
+		0xf4,0xff,0x14,0x00,0xe3,0xff,0x29,0x00,
+		0xc9,0xff,0x47,0x00,0xa5,0xff,0x71,0x00,
+		0x75,0xff,0xa8,0x00,0x37,0xff,0xef,0x00,
+		0xe7,0xfe,0x4a,0x01,0x7f,0xfe,0xbf,0x01,
+		0xf8,0xfd,0x5c,0x02,0x40,0xfd,0x38,0x03,
+		0x35,0xfc,0x85,0x04,0x85,0xfa,0xd2,0x06,
+		0x27,0xf7,0x51,0x0c,0x33,0xec,0xb8,0x30,
+		0xb2,0x6c,0x70,0xe6,0x5a,0x0e,0x23,0xf6,
+		0x6d,0x07,0x20,0xfa,0xcb,0x04,0x03,0xfc,
+		0x5d,0x03,0x23,0xfd,0x73,0x02,0xe7,0xfd,
+		0xcd,0x01,0x74,0xfe,0x52,0x01,0xe0,0xfe,
+		0xf4,0x00,0x32,0xff,0xab,0x00,0x73,0xff,
+		0x73,0x00,0xa4,0xff,0x49,0x00,0xc8,0xff,
+		0x29,0x00,0xe2,0xff,0x14,0x00,0xf4,0xff,
+		0x07,0x00,0xfd,0xff,0x01,0x00,0x00,0x00,
+		0x40,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0xec,0x7f,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
+		0x02,0x00,0x03,0x00,0x00,0x00,0x01,0x00,
+		0x02,0x00,0x03,0x00,0x01,0x00,0x01,0x00,
+		0x01,0x00,0x01,0x00,0x02,0x00,0x02,0x00,
+		0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
+		0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0xf6,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x52,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0xae,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0xff,
+		0x00,0x00,0x00,0x00"
+}
diff --git a/tools/topology/topology2/include/components/tdfb/line4_generic_pm10deg_48khz.conf b/tools/topology/topology2/include/components/tdfb/line4_generic_pm10deg_48khz.conf
new file mode 100644
index 000000000000..ab550cf5c32d
--- /dev/null
+++ b/tools/topology/topology2/include/components/tdfb/line4_generic_pm10deg_48khz.conf
@@ -0,0 +1,202 @@
+# Created with script example_two_beams_default.m 17-May-2024
+# cd tools/tune/tdfb; matlab -nodisplay -nosplash -nodesktop -r example_two_beams_default
+Object.Base.data."tdfb_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x00,0x00,0x00,0x00,
+		0x04,0x06,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x06,0x00,0x00,0x08,0x00,0x02,0x00,
+		0x01,0x00,0x04,0x00,0x01,0x00,0x01,0x00,
+		0x00,0x00,0x0f,0x00,0xa6,0xff,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x40,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0xec,0x7f,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x40,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x01,0x00,0xfe,0xff,0x03,0x00,0xfb,0xff,
+		0x08,0x00,0xf5,0xff,0x0f,0x00,0xed,0xff,
+		0x18,0x00,0xe2,0xff,0x25,0x00,0xd4,0xff,
+		0x35,0x00,0xc1,0xff,0x4a,0x00,0xa9,0xff,
+		0x65,0x00,0x8b,0xff,0x88,0x00,0x63,0xff,
+		0xb7,0x00,0x2b,0xff,0xf9,0x00,0xd9,0xfe,
+		0x63,0x01,0x4d,0xfe,0x29,0x02,0x17,0xfd,
+		0x5b,0x04,0x89,0xf7,0xd9,0x7e,0xb8,0x09,
+		0x5e,0xfb,0x01,0x03,0xce,0xfd,0xb5,0x01,
+		0xa0,0xfe,0x23,0x01,0x0d,0xff,0xce,0x00,
+		0x51,0xff,0x96,0x00,0x80,0xff,0x6e,0x00,
+		0xa2,0xff,0x50,0x00,0xbd,0xff,0x39,0x00,
+		0xd1,0xff,0x27,0x00,0xe0,0xff,0x19,0x00,
+		0xec,0xff,0x0f,0x00,0xf5,0xff,0x08,0x00,
+		0xfb,0xff,0x03,0x00,0xfe,0xff,0x01,0x00,
+		0x00,0x00,0x00,0x00,0x40,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0xff,0xff,0x03,0x00,
+		0xfb,0xff,0x07,0x00,0xf5,0xff,0x10,0x00,
+		0xeb,0xff,0x1b,0x00,0xdd,0xff,0x2b,0x00,
+		0xcb,0xff,0x41,0x00,0xb3,0xff,0x5c,0x00,
+		0x93,0xff,0x80,0x00,0x6a,0xff,0xaf,0x00,
+		0x34,0xff,0xee,0x00,0xe9,0xfe,0x49,0x01,
+		0x79,0xfe,0xd8,0x01,0xb9,0xfd,0xe8,0x02,
+		0x15,0xfc,0xe0,0x05,0xab,0xf4,0xd9,0x7d,
+		0xe7,0x0d,0x72,0xf9,0x41,0x04,0xe3,0xfc,
+		0x6e,0x02,0x08,0xfe,0xa2,0x01,0xa0,0xfe,
+		0x2b,0x01,0x00,0xff,0xdd,0x00,0x42,0xff,
+		0xa4,0x00,0x73,0xff,0x79,0x00,0x99,0xff,
+		0x58,0x00,0xb6,0xff,0x3e,0x00,0xcd,0xff,
+		0x2a,0x00,0xdf,0xff,0x1a,0x00,0xec,0xff,
+		0x0f,0x00,0xf5,0xff,0x07,0x00,0xfb,0xff,
+		0x02,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x40,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
+		0x02,0x00,0xfc,0xff,0x06,0x00,0xf7,0xff,
+		0x0d,0x00,0xee,0xff,0x17,0x00,0xe2,0xff,
+		0x25,0x00,0xd3,0xff,0x37,0x00,0xbe,0xff,
+		0x4e,0x00,0xa3,0xff,0x6d,0x00,0x81,0xff,
+		0x95,0x00,0x53,0xff,0xcb,0x00,0x13,0xff,
+		0x18,0x01,0xb3,0xfe,0x92,0x01,0x0f,0xfe,
+		0x7a,0x02,0xa7,0xfc,0x07,0x05,0x3d,0xf6,
+		0x70,0x7e,0x9d,0x0b,0x7a,0xfa,0x98,0x03,
+		0x5d,0xfd,0x0f,0x02,0x55,0xfe,0x62,0x01,
+		0xd6,0xfe,0xfe,0x00,0x26,0xff,0xbb,0x00,
+		0x5f,0xff,0x8b,0x00,0x88,0xff,0x67,0x00,
+		0xa8,0xff,0x4a,0x00,0xc1,0xff,0x34,0x00,
+		0xd5,0xff,0x23,0x00,0xe4,0xff,0x16,0x00,
+		0xef,0xff,0x0d,0x00,0xf7,0xff,0x06,0x00,
+		0xfc,0xff,0x02,0x00,0xff,0xff,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x40,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0xff,0xff,0x02,0x00,0xfc,0xff,
+		0x06,0x00,0xf7,0xff,0x0d,0x00,0xee,0xff,
+		0x17,0x00,0xe2,0xff,0x25,0x00,0xd3,0xff,
+		0x37,0x00,0xbe,0xff,0x4e,0x00,0xa3,0xff,
+		0x6d,0x00,0x81,0xff,0x95,0x00,0x53,0xff,
+		0xcb,0x00,0x13,0xff,0x18,0x01,0xb3,0xfe,
+		0x92,0x01,0x0f,0xfe,0x7a,0x02,0xa7,0xfc,
+		0x07,0x05,0x3d,0xf6,0x70,0x7e,0x9d,0x0b,
+		0x7a,0xfa,0x98,0x03,0x5d,0xfd,0x0f,0x02,
+		0x55,0xfe,0x62,0x01,0xd6,0xfe,0xfe,0x00,
+		0x26,0xff,0xbb,0x00,0x5f,0xff,0x8b,0x00,
+		0x88,0xff,0x67,0x00,0xa8,0xff,0x4a,0x00,
+		0xc1,0xff,0x34,0x00,0xd5,0xff,0x23,0x00,
+		0xe4,0xff,0x16,0x00,0xef,0xff,0x0d,0x00,
+		0xf7,0xff,0x06,0x00,0xfc,0xff,0x02,0x00,
+		0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x40,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0xff,0xff,0x03,0x00,0xfb,0xff,0x07,0x00,
+		0xf5,0xff,0x10,0x00,0xeb,0xff,0x1b,0x00,
+		0xdd,0xff,0x2b,0x00,0xcb,0xff,0x41,0x00,
+		0xb3,0xff,0x5c,0x00,0x93,0xff,0x80,0x00,
+		0x6a,0xff,0xaf,0x00,0x34,0xff,0xee,0x00,
+		0xe9,0xfe,0x49,0x01,0x79,0xfe,0xd8,0x01,
+		0xb9,0xfd,0xe8,0x02,0x15,0xfc,0xe0,0x05,
+		0xab,0xf4,0xd9,0x7d,0xe7,0x0d,0x72,0xf9,
+		0x41,0x04,0xe3,0xfc,0x6e,0x02,0x08,0xfe,
+		0xa2,0x01,0xa0,0xfe,0x2b,0x01,0x00,0xff,
+		0xdd,0x00,0x42,0xff,0xa4,0x00,0x73,0xff,
+		0x79,0x00,0x99,0xff,0x58,0x00,0xb6,0xff,
+		0x3e,0x00,0xcd,0xff,0x2a,0x00,0xdf,0xff,
+		0x1a,0x00,0xec,0xff,0x0f,0x00,0xf5,0xff,
+		0x07,0x00,0xfb,0xff,0x02,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x40,0x00,0x02,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x01,0x00,0xfe,0xff,
+		0x03,0x00,0xfb,0xff,0x08,0x00,0xf5,0xff,
+		0x0f,0x00,0xed,0xff,0x18,0x00,0xe2,0xff,
+		0x25,0x00,0xd4,0xff,0x35,0x00,0xc1,0xff,
+		0x4a,0x00,0xa9,0xff,0x65,0x00,0x8b,0xff,
+		0x88,0x00,0x63,0xff,0xb7,0x00,0x2b,0xff,
+		0xf9,0x00,0xd9,0xfe,0x63,0x01,0x4d,0xfe,
+		0x29,0x02,0x17,0xfd,0x5b,0x04,0x89,0xf7,
+		0xd9,0x7e,0xb8,0x09,0x5e,0xfb,0x01,0x03,
+		0xce,0xfd,0xb5,0x01,0xa0,0xfe,0x23,0x01,
+		0x0d,0xff,0xce,0x00,0x51,0xff,0x96,0x00,
+		0x80,0xff,0x6e,0x00,0xa2,0xff,0x50,0x00,
+		0xbd,0xff,0x39,0x00,0xd1,0xff,0x27,0x00,
+		0xe0,0xff,0x19,0x00,0xec,0xff,0x0f,0x00,
+		0xf5,0xff,0x08,0x00,0xfb,0xff,0x03,0x00,
+		0xfe,0xff,0x01,0x00,0x00,0x00,0x00,0x00,
+		0x40,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0xec,0x7f,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
+		0x02,0x00,0x03,0x00,0x00,0x00,0x01,0x00,
+		0x02,0x00,0x03,0x00,0x01,0x00,0x01,0x00,
+		0x01,0x00,0x01,0x00,0x02,0x00,0x02,0x00,
+		0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
+		0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0xf6,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x52,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0xae,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0xff,
+		0x00,0x00,0x00,0x00"
+}
diff --git a/tools/topology/topology2/include/components/tdfb/line4_pass.conf b/tools/topology/topology2/include/components/tdfb/line4_pass.conf
index d32da6170539..9838f4dd32bf 100644
--- a/tools/topology/topology2/include/components/tdfb/line4_pass.conf
+++ b/tools/topology/topology2/include/components/tdfb/line4_pass.conf
@@ -1,16 +1,31 @@
-# Exported with script example_pass_config.m 23-Oct-2023
+# Exported with script example_pass_config.m 13-May-2024
 # cd tools/tune/tdfb; octave --no-window-system example_pass_config.m
 Object.Base.data."tdfb_config" {
 	bytes "
 		0x53,0x4f,0x46,0x34,0x00,0x00,0x00,0x00,
-		0x34,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0xac,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
 		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x34,0x00,0x00,0x00,0x04,0x00,0x04,0x00,
-		0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0xac,0x00,0x00,0x00,0x04,0x00,0x04,0x00,
+		0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
 		0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
 		0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
 		0x02,0x00,0x03,0x00,0x01,0x00,0x02,0x00,
 		0x04,0x00,0x08,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 		0x00,0x00,0x00,0x00"
 }
diff --git a/tools/topology/topology2/include/components/tdfb/line4to2_pass.conf b/tools/topology/topology2/include/components/tdfb/line4to2_pass.conf
new file mode 100644
index 000000000000..2f6a6f839166
--- /dev/null
+++ b/tools/topology/topology2/include/components/tdfb/line4to2_pass.conf
@@ -0,0 +1,22 @@
+# Exported with script example_pass_config.m 16-May-2024
+# cd tools/tune/tdfb; octave --no-window-system example_pass_config.m
+Object.Base.data."tdfb_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x00,0x00,0x00,0x00,
+		0x68,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x68,0x00,0x00,0x00,0x02,0x00,0x02,0x00,
+		0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
+		0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x04,0x00,0xff,0xff,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x04,0x00,0xff,0xff,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,
+		0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00"
+}
diff --git a/tools/topology/topology2/include/controls/enum.conf b/tools/topology/topology2/include/controls/enum.conf
index 349f062475c1..48da5fc8a760 100644
--- a/tools/topology/topology2/include/controls/enum.conf
+++ b/tools/topology/topology2/include/controls/enum.conf
@@ -84,9 +84,6 @@ Class.Control."enum" {
 			"index"
 			"instance"
 		]
-		!mandatory [
-			name
-		]
 		#
 		# enum control objects instantiated within the same alsaconf node must have unique
 		# index attribute
diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-gain-module-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-gain-module-copier-capture.conf
new file mode 100644
index 000000000000..9a66d6b32f29
--- /dev/null
+++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-gain-module-copier-capture.conf
@@ -0,0 +1,204 @@
+#
+# BE capture pipeline: dai-copier-eqiir-gain-module-copier-capture
+#
+# All attributes defined herein are namespaced
+# by alsatplg to "Object.Pipeline.dai-copier-eqiir-gain-module-copier-capture.N.attribute_name"
+#
+# Usage: dai-copier-eqiir-gain-module-copier-capture pipeline object can be instantiated as:
+#
+# Object.Pipeline.dai-copier-eqiir-gain-module-copier-capture."N" {
+# 	period		1000
+# 	time_domain	"timer"
+# }
+#
+# Where N is the unique pipeline ID within the same alsaconf node.
+#
+
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
+<include/components/dai-copier.conf>
+<include/controls/bytes.conf>
+<include/components/eqiir.conf>
+<include/components/pipeline.conf>
+
+Class.Pipeline."dai-copier-eqiir-gain-module-copier-capture" {
+
+	<include/pipelines/pipeline-common.conf>
+
+	attributes {
+		!constructor [
+			"index"
+		]
+
+		!immutable [
+			"direction"
+		]
+
+		#
+		# dai-copier-eqiir-gain-module-copier-capture objects instantiated
+		# within the same alsaconf node must have unique pipeline_id
+		# attribute
+		#
+		unique	"instance"
+	}
+
+	Object.Widget {
+		dai-copier."1" {
+			type dai_out
+			num_input_audio_formats 2
+			num_output_audio_formats 2
+			num_output_pins 1
+
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_channels		4
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map	$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_channels		4
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map	$CHANNEL_MAP_3_POINT_1
+				}
+			]
+		}
+
+		eqiir."1" {
+			num_input_audio_formats 2
+			num_output_audio_formats 2
+
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_channels		4
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map	$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_channels		4
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map	$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
+			Object.Control.bytes."1" {
+				IncludeByKey.DMIC0_DAI_EQIIR {
+					"passthrough"		"include/components/eqiir/passthrough.conf"
+					"highpass_40hz_0db"	"include/components/eqiir/highpass_40hz_0db_48khz.conf"
+					"highpass_40hz_20db"	"include/components/eqiir/highpass_40hz_20db_48khz.conf"
+				}
+			}
+		}
+
+		gain."1" {
+			num_input_audio_formats 2
+			num_input_pins 1
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
+			num_output_audio_formats 2
+			num_output_pins 1
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+			]
+		}
+
+		module-copier."2" {
+			num_input_audio_formats 2
+			num_output_audio_formats 2
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_channels		4
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map	$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_channels		4
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map	$CHANNEL_MAP_3_POINT_1
+				}
+			]
+		}
+
+		pipeline."1" {
+			priority	0
+			lp_mode		0
+		}
+	}
+
+	Object.Base {
+		route.1 {
+			source	gain.$index.1
+			sink	module-copier.$index.2
+		}
+	}
+
+	direction	"capture"
+	dynamic_pipeline 1
+	time_domain	"timer"
+}
diff --git a/tools/topology/topology2/platform/intel/dmic-default.conf b/tools/topology/topology2/platform/intel/dmic-default.conf
index 6ebcab81f89b..7b4453dcb624 100644
--- a/tools/topology/topology2/platform/intel/dmic-default.conf
+++ b/tools/topology/topology2/platform/intel/dmic-default.conf
@@ -40,4 +40,12 @@ Define {
 	DMIC0_RATE                      48000
 	DMIC1_RATE                      16000
 	DMIC1_ENABLE			"false"
+
+	# TDFB pipeline
+	DMIC0_ENHANCED_CAPTURE		"false"
+	DMIC0_TDFB_PCM_ID		200
+	DMIC0_TDFB_PCM_NAME		"DMIC Enhanced Audio"
+	DMIC0_TDFB_HOST_PIPELINE_ID	22
+	DMIC0_TDFB_HOST_PIPELINE_SINK	"copier.host.22.1"
+	DMIC0_TDFB_PCM_CAPS		"Enhanced Audio Capture 22"
 }
diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf
index e966a7d62b03..f68c0f4d1ee8 100644
--- a/tools/topology/topology2/platform/intel/dmic-generic.conf
+++ b/tools/topology/topology2/platform/intel/dmic-generic.conf
@@ -73,7 +73,7 @@ IncludeByKey.PASSTHROUGH {
 			"true"	"platform/intel/dmic-wov.conf"
 		}
 
-		Object.Pipeline.gain-capture [
+		Object.Pipeline.host-gateway-capture [
 			{
 				format		$FORMAT
 				index 		$DMIC0_HOST_PIPELINE_ID
@@ -114,92 +114,14 @@ IncludeByKey.PASSTHROUGH {
 						}
 					]
 				}
-				Object.Widget.gain.1 {
-					curve_duration 500000
-					num_input_audio_formats 2
-					num_output_audio_formats 2
-					Object.Base.input_audio_format [
-						{
-							in_rate			$DMIC0_RATE
-							in_bit_depth		32
-							in_valid_bit_depth	32
-						}
-						{
-							in_rate			$DMIC0_RATE
-							in_channels		4
-							in_bit_depth		32
-							in_valid_bit_depth	32
-							in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-							in_ch_map	$CHANNEL_MAP_3_POINT_1
-						}
-					]
-					Object.Base.output_audio_format [
-						{
-							out_rate		$DMIC0_RATE
-							out_bit_depth		32
-							out_valid_bit_depth	32
-						}
-						{
-							out_rate		$DMIC0_RATE
-							out_channels		4
-							out_bit_depth		32
-							out_valid_bit_depth	32
-							out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-							out_ch_map	$CHANNEL_MAP_3_POINT_1
-						}
-					]
-					Object.Control.mixer.1 {
-						name 'Dmic0 Capture Volume'
-					}
-					Object.Control.mixer.2 {
-						name 'Dmic0 Capture Switch'
 
-						mute_led_use 		1
-						mute_led_direction	1
-					}
-				}
-
-				Object.Widget.module-copier."2" {
-					num_input_audio_formats 2
-					num_output_audio_formats 2
-					Object.Base.input_audio_format [
-						{
-							in_rate			$DMIC0_RATE
-							in_bit_depth		32
-							in_valid_bit_depth	32
-						}
-						{
-							in_rate			$DMIC0_RATE
-							in_channels		4
-							in_bit_depth		32
-							in_valid_bit_depth	32
-							in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-							in_ch_map	$CHANNEL_MAP_3_POINT_1
-						}
-					]
-					Object.Base.output_audio_format [
-						{
-							out_rate		$DMIC0_RATE
-							out_bit_depth		32
-							out_valid_bit_depth	32
-						}
-						{
-							out_rate		$DMIC0_RATE
-							out_channels		4
-							out_bit_depth		32
-							out_valid_bit_depth	32
-							out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-							out_ch_map	$CHANNEL_MAP_3_POINT_1
-						}
-					]
-				}
 				Object.Widget.pipeline."1" {
 					core $DMIC_CORE_ID
 				}
 			}
 		]
 
-		Object.Pipeline.dai-copier-eqiir-module-copier-capture [
+		Object.Pipeline.dai-copier-eqiir-gain-module-copier-capture [
 			{
 				index		$DMIC0_DAI_PIPELINE_ID
 				core_id		$DMIC_CORE_ID
@@ -358,6 +280,53 @@ IncludeByKey.PASSTHROUGH {
 						}
 					]
 				}
+
+				Object.Widget.gain.1 {
+					curve_duration 500000
+					num_input_audio_formats 2
+					num_output_audio_formats 2
+					Object.Base.input_audio_format [
+						{
+							in_rate			$DMIC0_RATE
+							in_bit_depth		32
+							in_valid_bit_depth	32
+						}
+						{
+							in_rate			$DMIC0_RATE
+							in_channels		4
+							in_bit_depth		32
+							in_valid_bit_depth	32
+							in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+							in_ch_map	$CHANNEL_MAP_3_POINT_1
+						}
+					]
+					Object.Base.output_audio_format [
+						{
+							out_rate		$DMIC0_RATE
+							out_bit_depth		32
+							out_valid_bit_depth	32
+						}
+						{
+							out_rate		$DMIC0_RATE
+							out_channels		4
+							out_bit_depth		32
+							out_valid_bit_depth	32
+							out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+							out_ch_map	$CHANNEL_MAP_3_POINT_1
+						}
+					]
+					Object.Control.mixer.1 {
+						name 'Dmic0 Capture Volume'
+					}
+					Object.Control.mixer.2 {
+						name 'Dmic0 Capture Switch'
+
+						mute_led_use 		1
+						mute_led_direction	1
+					}
+				}
+
+
 				Object.Widget.pipeline."1" {
 					core $DMIC_CORE_ID
 					priority $DMIC_PIPELINE_PRIORITY
@@ -367,18 +336,22 @@ IncludeByKey.PASSTHROUGH {
 		Object.Base.route [
 			{
 				source $DMIC0_DAI_COPIER
-				sink $DMIC0_DAI_GAIN
+				sink eqiir.$DMIC0_DAI_PIPELINE_ID.1
 			}
 			{
-				source $DMIC0_DAI_PIPELINE_SRC
-				sink $DMIC0_HOST_PIPELINE_SINK
+				source eqiir.$DMIC0_DAI_PIPELINE_ID.1
+				sink gain.$DMIC0_DAI_PIPELINE_ID.1
 			}
 			{
-				source	"gain.$DMIC0_HOST_PIPELINE_ID.1"
-				sink	"host-copier.$DMIC0_PCM_ID.capture"
+				source $DMIC0_DAI_PIPELINE_SRC
+				sink $DMIC0_HOST_PIPELINE_SINK
 			}
 		]
-	}
+
+		IncludeByKey.DMIC0_ENHANCED_CAPTURE {
+			"true"	"platform/intel/dmic0-enhanced-capture.conf"
+		}
+}
 "true"	{
 		Object.Pipeline.host-gateway-capture [
 			{
diff --git a/tools/topology/topology2/platform/intel/dmic0-enhanced-capture.conf b/tools/topology/topology2/platform/intel/dmic0-enhanced-capture.conf
new file mode 100644
index 000000000000..9d644be973fb
--- /dev/null
+++ b/tools/topology/topology2/platform/intel/dmic0-enhanced-capture.conf
@@ -0,0 +1,165 @@
+<include/components/tdfb.conf>
+
+Object.Widget.tdfb.1 {
+	index		$DMIC0_TDFB_HOST_PIPELINE_ID
+	Object.Control {
+		bytes."1" {
+			name 'Dmic0 Capture TDFB bytes'
+			max 16384
+			IncludeByKey.EFX_DMIC0_TDFB_PARAMS {
+				"line2_pass" "include/components/tdfb/line2_pass.conf"
+				"line2_generic_pm10deg" "include/components/tdfb/line2_generic_pm10deg_48khz.conf"
+				"line2_50mm" "include/components/tdfb/line2_50mm_pm0_30_90deg_48khz.conf"
+				"line2_68mm" "include/components/tdfb/line2_68mm_pm0_30_90deg_48khz.conf"
+				"line2_74mm" "include/components/tdfb/line2_74mm_pm0_30_90deg_48khz.conf"
+				"line4_pass" "include/components/tdfb/line4to2_pass.conf"
+				"line4_generic_pm10deg" "include/components/tdfb/line4_generic_pm10deg_48khz.conf"
+				"line4_28mm" "include/components/tdfb/line2_28mm_pm0_30_90deg_48khz.conf"
+			}
+		}
+		mixer."1" {
+			name 'Dmic0 Capture TDFB beam switch'
+		}
+		enum."1" {
+			name 'Dmic0 Capture TDFB angle set enum'
+		}
+		# Tracking is disabled from this topology, causes high MCPS
+		#mixer."2" {
+		#	 name 'Dmic0 Capture TDFB track switch'
+		#}
+		#enum."2" {
+		#	 name 'Dmic0 Capture TDFB angle estimate enum'
+		#}
+	}
+	IncludeByKey.NUM_DMICS {
+                "2" {
+                        num_input_audio_formats	1
+                        Object.Base.input_audio_format [
+                                {
+                                        input_pin_index		0
+                                        in_rate			$DMIC0_RATE
+                                        in_channels		2
+                                        in_bit_depth		32
+                                        in_valid_bit_depth	32
+                                }
+                        ]
+                }
+                "4" {
+                        num_input_audio_formats	1
+                        Object.Base.input_audio_format [
+                                {
+                                        input_pin_index		0
+                                        in_rate			$DMIC0_RATE
+                                        in_channels		4
+                                        in_bit_depth		32
+                                        in_valid_bit_depth	32
+                                        in_ch_cfg               $CHANNEL_CONFIG_3_POINT_1
+                                        in_ch_map               $CHANNEL_MAP_3_POINT_1
+                                }
+                        ]
+                }
+        }
+	num_output_audio_formats	1
+	Object.Base.output_audio_format [
+		{
+			input_pin_index		0
+			out_channels		2
+			out_rate		$DMIC0_RATE
+			out_bit_depth		32
+			out_valid_bit_depth	32
+		}
+	]
+}
+
+Object.Widget.drc.1 {
+	index		$DMIC0_TDFB_HOST_PIPELINE_ID
+	Object.Control {
+		bytes."1" {
+			name 'Dmic0 Capture DRC bytes'
+			IncludeByKey.EFX_DMIC0_DRC_PARAMS {
+				"passthrough" "include/components/drc/passthrough.conf"
+				"dmic_default" "include/components/drc/dmic_default.conf"
+			}
+		}
+		mixer."1" {
+			name 'Dmic0 Capture DRC switch'
+		}
+	}
+	num_input_audio_formats	    1
+	Object.Base.input_audio_format [
+		{
+			in_rate			$DMIC0_RATE
+			in_bit_depth		32
+			in_valid_bit_depth	32
+		}
+	]
+	num_output_audio_formats	1
+	Object.Base.output_audio_format [
+		{
+			out_rate		$DMIC0_RATE
+			out_bit_depth		32
+			out_valid_bit_depth	32
+		}
+	]
+}
+
+Object.Pipeline.host-gateway-capture [
+	{
+		index		$DMIC0_TDFB_HOST_PIPELINE_ID
+		Object.Widget.host-copier.1 {
+			stream_name $DMIC0_TDFB_PCM_CAPS
+			pcm_id $DMIC0_TDFB_PCM_ID
+			num_input_audio_formats	1
+			Object.Base.input_audio_format [
+				{
+					in_rate			$DMIC0_RATE
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+			]
+			num_output_audio_formats	1
+			Object.Base.output_audio_format [
+				{
+					out_rate		$DMIC0_RATE
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
+		}
+	}
+]
+
+Object.Base.route [
+	{
+		source	$DMIC0_DAI_PIPELINE_SRC
+		sink	tdfb.$DMIC0_TDFB_HOST_PIPELINE_ID.1
+	}
+	{
+		source	tdfb.$DMIC0_TDFB_HOST_PIPELINE_ID.1
+		sink	drc.$DMIC0_TDFB_HOST_PIPELINE_ID.1
+	}
+	{
+		source	drc.$DMIC0_TDFB_HOST_PIPELINE_ID.1
+		sink	host-copier.$DMIC0_TDFB_PCM_ID.capture
+	}
+]
+
+Object.PCM.pcm [
+	{
+		name	"$DMIC0_TDFB_PCM_NAME"
+		id $DMIC0_TDFB_PCM_ID
+		direction	"capture"
+		Object.Base.fe_dai.1 {
+			name "$DMIC0_TDFB_PCM_NAME"
+		}
+
+		Object.PCM.pcm_caps.1 {
+			name $DMIC0_TDFB_PCM_CAPS
+			formats 'S32_LE'
+			channels_min 2
+			channels_max 2
+			rate_min $DMIC0_RATE
+			rate_max $DMIC0_RATE
+		}
+	}
+]
diff --git a/tools/topology/topology2/platform/intel/hda-enhanced-capture.conf b/tools/topology/topology2/platform/intel/hda-enhanced-capture.conf
new file mode 100644
index 000000000000..e25e7b3592cd
--- /dev/null
+++ b/tools/topology/topology2/platform/intel/hda-enhanced-capture.conf
@@ -0,0 +1,147 @@
+<include/components/tdfb.conf>
+
+Object.Widget.tdfb.1 {
+	index		$HDA_MIC_TDFB_HOST_PIPELINE_ID
+	Object.Control {
+		bytes."1" {
+			name 'Analog Capture TDFB bytes'
+			max 16384
+			IncludeByKey.EFX_HDA_MIC_TDFB_PARAMS {
+				"line2_pass" "include/components/tdfb/line2_pass.conf"
+				"line2_generic_pm10deg" "include/components/tdfb/line2_generic_pm10deg_48khz.conf"
+				"line2_50mm" "include/components/tdfb/line2_50mm_pm0_30_90deg_48khz.conf"
+				"line2_68mm" "include/components/tdfb/line2_68mm_pm0_30_90deg_48khz.conf"
+				"line2_74mm" "include/components/tdfb/line2_74mm_pm0_30_90deg_48khz.conf"
+				"line4_pass" "include/components/tdfb/line4to2_pass.conf"
+				"line4_generic_pm10deg" "include/components/tdfb/line4_generic_pm10deg_48khz.conf"
+				"line4_28mm" "include/components/tdfb/line2_28mm_pm0_30_90deg_48khz.conf"
+			}
+		}
+		mixer."1" {
+			name 'Analog Capture TDFB beam switch'
+		}
+		enum."1" {
+			name 'Analog Capture TDFB angle set enum'
+		}
+		# Tracking is disabled from this topology, causes high MCPS
+		#mixer."2" {
+		#	 name 'Analog Capture TDFB track switch'
+		#}
+		#enum."2" {
+		#	 name 'Analog Capture TDFB angle estimate enum'
+		#}
+	}
+	num_input_audio_formats	1
+	Object.Base.input_audio_format [
+		{
+			input_pin_index		0
+			in_rate			$HDA_ANALOG_CAPTURE_RATE
+			in_channels		2
+			in_bit_depth		32
+			in_valid_bit_depth	32
+		}
+	]
+	num_output_audio_formats	1
+	Object.Base.output_audio_format [
+		{
+			output_pin_index	0
+			out_channels		2
+			out_rate		$HDA_ANALOG_CAPTURE_RATE
+			out_bit_depth		32
+			out_valid_bit_depth	32
+		}
+	]
+}
+
+Object.Widget.drc.1 {
+	index		$HDA_MIC_TDFB_HOST_PIPELINE_ID
+	Object.Control {
+		bytes."1" {
+			name 'Analog Capture DRC bytes'
+			IncludeByKey.EFX_HDA_MIC_DRC_PARAMS {
+				"passthrough" "include/components/drc/passthrough.conf"
+				"dmic_default" "include/components/drc/dmic_default.conf"
+			}
+		}
+		mixer."1" {
+			name 'Analog Capture DRC switch'
+		}
+	}
+	num_input_audio_formats	    1
+	Object.Base.input_audio_format [
+		{
+			in_rate			$HDA_ANALOG_CAPTURE_RATE
+			in_bit_depth		32
+			in_valid_bit_depth	32
+		}
+	]
+	num_output_audio_formats	1
+	Object.Base.output_audio_format [
+		{
+			out_rate		$HDA_ANALOG_CAPTURE_RATE
+			out_bit_depth		32
+			out_valid_bit_depth	32
+		}
+	]
+}
+
+Object.Pipeline.host-gateway-capture [
+	{
+		index		$HDA_MIC_TDFB_HOST_PIPELINE_ID
+		Object.Widget.host-copier.1 {
+			stream_name $HDA_MIC_TDFB_PCM_CAPS
+			pcm_id $HDA_MIC_TDFB_PCM_ID
+			num_input_audio_formats	1
+			Object.Base.input_audio_format [
+				{
+					in_rate			$HDA_ANALOG_CAPTURE_RATE
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+			]
+			num_output_audio_formats	1
+			Object.Base.output_audio_format [
+				{
+					out_rate		$HDA_ANALOG_CAPTURE_RATE
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
+		}
+	}
+]
+
+Object.Base.route [
+	{
+		source	$HDA_MIC_DAI_PIPELINE_SRC
+		sink	tdfb.$HDA_MIC_TDFB_HOST_PIPELINE_ID.1
+	}
+	{
+		source	tdfb.$HDA_MIC_TDFB_HOST_PIPELINE_ID.1
+		sink	drc.$HDA_MIC_TDFB_HOST_PIPELINE_ID.1
+	}
+	{
+		source	drc.$HDA_MIC_TDFB_HOST_PIPELINE_ID.1
+		sink	host-copier.$HDA_MIC_TDFB_PCM_ID.capture
+	}
+]
+
+Object.PCM.pcm [
+	{
+		name	"$HDA_MIC_TDFB_PCM_NAME"
+		id $HDA_MIC_TDFB_PCM_ID
+		direction	"capture"
+		Object.Base.fe_dai.1 {
+			name "$HDA_MIC_TDFB_PCM_NAME"
+		}
+
+		Object.PCM.pcm_caps.1 {
+			name $HDA_MIC_TDFB_PCM_CAPS
+			formats 'S32_LE'
+			channels_min 2
+			channels_max 2
+			rate_min $HDA_ANALOG_CAPTURE_RATE
+			rate_max $HDA_ANALOG_CAPTURE_RATE
+		}
+	}
+]
diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf
index 16b39440bf58..17951a0452c3 100644
--- a/tools/topology/topology2/sof-hda-generic.conf
+++ b/tools/topology/topology2/sof-hda-generic.conf
@@ -21,6 +21,7 @@
 <mixout-gain-efx-mbdrc-dai-copier-playback.conf>
 <mixout-gain-host-copier-capture.conf>
 <dai-copier-eqiir-module-copier-capture.conf>
+<dai-copier-eqiir-gain-module-copier-capture.conf>
 <gain-capture.conf>
 <deepbuffer-playback.conf>
 <io-gateway.conf>
@@ -46,10 +47,9 @@ Define {
 	PLATFORM "none"
 	NUM_DMICS 0
 # doesn't it need to define DMIC0_HOST_PIPELINE_SINK and DMIC0_DAI_PIPELINE_SRC?
-	DMIC0_HOST_PIPELINE_SINK 'gain.11.1'
+	DMIC0_HOST_PIPELINE_SINK 'host-copier.6.capture'
 	DMIC0_DAI_PIPELINE_SRC 'module-copier.12.2'
 	DMIC0_DAI_COPIER 'dai-copier.DMIC.dmic01.capture'
-	DMIC0_DAI_GAIN 'eqiir.12.1'
 	DMIC0_DAI_EQIIR "highpass_40hz_20db"
 	DMIC0_PCM_CAPS 'Gain Capture 11'
 }