topology2: cavs: fix WoV pipeline routing

The SoundWire topology cannot instantiate the existing WoV pipeline.
It does not import the KPB or detector classes, and its DAI route
names a widget that cannot exist because copier names use their stream
name.

Import the required classes and move the DAI-to-KPB route to dmic-wov.
Fix the KPB output pin target, describe the host copier input formats,
and set the 16 kHz PCM constraints so hw_params can select the mono
detector path.

Parameterize the KPB UUID, keeping the IPC3 default while allowing
IPC4 targets to select kpb4.

Signed-off-by: Gaggery Tsai <gaggery.tsai@intel.com>

Author: TsaiGaggery

tools/topology/topology2/cavs-sdw.conf

@@ -35,6 +35,10 @@
 <src.conf>
 <io-gateway.conf>
 <io-gateway-capture.conf>
+<input_pin_binding.conf>
+<output_pin_binding.conf>
+<dai-kpb-be.conf>
+<wov-detect.conf>
 <highpass-capture-be.conf>
 <data.conf>
 <pcm.conf>

tools/topology/topology2/include/components/kpb.conf

@@ -12,6 +12,12 @@
 #
 # Where N is the unique instance number for the kpb object within the same alsaconf node.
 
+# Keep the IPC3 UUID as the default. IPC4 topologies must select kpb4 by
+# overriding KPB_UUID in the top-level topology.
+Define {
+	KPB_UUID	"43:84:21:d8:f3:5f:4c:4a:b3:88:6c:fe:07:b9:56:2e"
+}
+
 Class.Widget."kpb" {
 	#
 	# Pipeline ID for the kpb object
@@ -67,8 +73,7 @@ Class.Widget."kpb" {
 	num_input_audio_formats 1
 	num_output_audio_formats 1
 
-	#UUID: D8218443-5FF3-4A4C-B388-6CFE07B9562E
-	uuid		"43:84:21:d8:f3:5f:4c:4a:b3:88:6c:fe:07:b9:56:2e"
+	uuid		$KPB_UUID
 	no_pm 		"true"
 	cpc 720000
 	num_input_pins		1

tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf

@@ -125,12 +125,8 @@ Class.Pipeline."dai-kpb-be" {
 		}
 	}
 
-	Object.Base {
-		route."1" {
-			source	"dai-copier.DMIC.$index.1"
-			sink	"kpb.$index.1"
-		}
-	}
+	# DAI copier names contain the stream name instead of the pipeline
+	# index. The instantiating topology must provide the route to KPB.
 
 	time_domain	"timer"
 	dynamic_pipeline 1

tools/topology/topology2/platform/intel/dmic-default.conf

@@ -25,11 +25,6 @@ Define {
 	DMIC1_HOST_PIPELINE_ID		18
 	DMIC1_DAI_PIPELINE_ID		19
 	WOV_PIPELINE_ID			20
-	DMIC1_HOST_PIPELINE_SINK	'copier.host.18.1'
-	DMIC_WOV_DAI_PIPELINE_SRC	'dai-copier.DMIC.dmic16k.capture'
-	DMIC_WOV_DAI_PIPELINE_KPB	'kpb.19.1'
-	WOV_PIPELINE_SINK		'micsel.20.1'
-	WOV_PIPELINE_VIRTUAL		'virtual.detect_sink'
 	INCLUDE_WOV			'false'
 	# The UUID corresponds to the test detect component
 	WOV_UUID			'1f:d5:a8:eb:27:78:b5:47:82:ee:de:6e:77:43:af:67'

tools/topology/topology2/platform/intel/dmic-wov.conf

@@ -9,9 +9,41 @@ Object.Pipeline {
 
 			Object.Widget.host-copier.1 {
 				stream_name $DMIC1_PCM_CAPS
-				pcm_id 11
-				num_output_audio_formats 2
+				pcm_id $DMIC1_PCM_ID
+				num_input_audio_formats 3
+				num_output_audio_formats 3
+				Object.Base.input_audio_format [
+					{
+						in_rate			16000
+						in_channels		1
+						in_ch_cfg		$CHANNEL_CONFIG_MONO
+						in_ch_map		$CHANNEL_MAP_MONO
+						in_bit_depth		32
+						in_valid_bit_depth	32
+					}
+					{
+						in_rate			16000
+						in_bit_depth		32
+						in_valid_bit_depth	32
+					}
+					{
+						in_rate			16000
+						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		16000
+						out_channels		1
+						out_ch_cfg		$CHANNEL_CONFIG_MONO
+						out_ch_map		$CHANNEL_MAP_MONO
+						out_bit_depth		32
+						out_valid_bit_depth	32
+					}
 					{
 						out_rate		16000
 						out_bit_depth		32
@@ -84,10 +116,10 @@ Object.Pipeline {
 
 			Object.Widget.kpb.1 {
 				Object.Base.output_pin_binding.1 {
-					output_pin_binding_name $WOV_PIPELINE_SINK
+					output_pin_binding_name "micsel.$WOV_PIPELINE_ID.1"
 				}
 				Object.Base.output_pin_binding.2 {
-					output_pin_binding_name $DMIC1_HOST_PIPELINE_SINK
+					output_pin_binding_name "host-copier.$DMIC1_PCM_ID.capture"
 				}
 				Object.Base.output_pin_binding.3 {
 					output_pin_binding_name "NotConnected"
@@ -111,23 +143,27 @@ Object.Pipeline {
 
 Object.Base.route [
 	{
-		source $DMIC_WOV_DAI_PIPELINE_KPB
-		sink "host-copier.11.capture"
+		source "dai-copier.DMIC.$DMIC1_NAME.capture"
+		sink "kpb.$DMIC1_DAI_PIPELINE_ID.1"
+	}
+	{
+		source "kpb.$DMIC1_DAI_PIPELINE_ID.1"
+		sink "host-copier.$DMIC1_PCM_ID.capture"
 	}
 	{
-		source $DMIC_WOV_DAI_PIPELINE_KPB
-		sink $WOV_PIPELINE_SINK
+		source "kpb.$DMIC1_DAI_PIPELINE_ID.1"
+		sink "micsel.$WOV_PIPELINE_ID.1"
 	}
 	{
-		source $WOV_PIPELINE_VIRTUAL
-		sink "host-copier.11.capture"
+		source "virtual.detect_sink"
+		sink "host-copier.$DMIC1_PCM_ID.capture"
 	}
 ]
 
 Object.PCM.pcm [
 	{
 		name	"DMIC16k"
-		id	11
+		id	$DMIC1_PCM_ID
 		direction	"capture"
 		capture_compatible_d0i3	true
 		Object.Base.fe_dai.1 {
@@ -136,10 +172,10 @@ Object.PCM.pcm [
 
 		Object.PCM.pcm_caps.1 {
 			name $DMIC1_PCM_CAPS
-			# only 32-bit capture supported now
 			formats 'S32_LE'
-			channels_min $NUM_DMICS
+			channels_min 1
 			channels_max $NUM_DMICS
+			rates        '16000'
 			rate_min     16000
 			rate_max     16000
 		}