From cfeaceb39442c6b526e35603dff53f31577454c4 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Tue, 14 Feb 2023 15:01:57 +0200
Subject: [PATCH] topology2: use passthrough-capture-be instead of
 passthrough-be

As the copier can do format conversions, and many pipeline components
can do conversions as well, it is important for the topology to define a
single format to use in the "dai_out" copier. This ensures deterministic
behaviour with the driver.

Implement this behaviour by switching topologies to use the
passthrough-capture-be pipeline as template for the backend capture
pipelines.

The previously used passthrough-be template is problematic as
the base class already defines multiple audio formats, with multiple
different sample formats. The new passthrough-capture-be only defines
one sample format by default and is a better starting point as a base
class.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 tools/topology/topology2/cavs-mixin-mixout-hda.conf         | 2 +-
 tools/topology/topology2/cavs-nocodec-bt.conf               | 5 +++--
 tools/topology/topology2/cavs-nocodec.conf                  | 6 +++---
 tools/topology/topology2/cavs-rt5682.conf                   | 3 ++-
 tools/topology/topology2/cavs-sdw-src-gain-mixin.conf       | 4 ++--
 tools/topology/topology2/cavs-sdw.conf                      | 3 ++-
 tools/topology/topology2/platform/intel/bt-generic.conf     | 2 +-
 .../topology/topology2/platform/intel/sdw-amp-generic.conf  | 2 +-
 .../topology/topology2/platform/intel/sdw-dmic-generic.conf | 2 +-
 tools/topology/topology2/sof-hda-generic.conf               | 1 +
 10 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/tools/topology/topology2/cavs-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
index 95662d468..43d91d501 100644
--- a/tools/topology/topology2/cavs-mixin-mixout-hda.conf
+++ b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
@@ -63,7 +63,7 @@ Object.Pipeline {
 		}
 	}
 
-	passthrough-be.1 {
+	passthrough-capture-be.1 {
 		index		4
 		direction	capture
 
diff --git a/tools/topology/topology2/cavs-nocodec-bt.conf b/tools/topology/topology2/cavs-nocodec-bt.conf
index 2cce74f01..957f1594e 100644
--- a/tools/topology/topology2/cavs-nocodec-bt.conf
+++ b/tools/topology/topology2/cavs-nocodec-bt.conf
@@ -13,6 +13,7 @@
 <passthrough-playback.conf>
 <passthrough-capture.conf>
 <passthrough-be.conf>
+<passthrough-capture-be.conf>
 <data.conf>
 <pcm.conf>
 <pcm_caps.conf>
@@ -175,7 +176,7 @@ Object.Pipeline {
 		}
 	}
 
-	passthrough-be.4 {
+	passthrough-capture-be.4 {
 		index		6
 		direction	capture
 		Object.Widget.pipeline.1 {
@@ -209,7 +210,7 @@ Object.Pipeline {
 		}
 	}
 
-	passthrough-be.5 {
+	passthrough-capture-be.5 {
 		index		10
 		direction	capture
 		Object.Widget.pipeline.1 {
diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf
index b0e9ed0d2..b1f928aab 100644
--- a/tools/topology/topology2/cavs-nocodec.conf
+++ b/tools/topology/topology2/cavs-nocodec.conf
@@ -11,7 +11,7 @@
 <tokens.conf>
 <virtual.conf>
 <passthrough-capture.conf>
-<passthrough-be.conf>
+<passthrough-capture-be.conf>
 <dai-kpb-be.conf>
 <wov-detect.conf>
 <host-copier-gain-mixin-playback.conf>
@@ -405,7 +405,7 @@ Object.Pipeline {
 		}
 	}
 
-	passthrough-be.5 {
+	passthrough-capture-be.5 {
 		index		10
 		direction	capture
 
@@ -434,7 +434,7 @@ Object.Pipeline {
 		}
 	}
 
-	passthrough-be.6 {
+	passthrough-capture-be.6 {
 		index		12
 		direction	capture
 
diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
index f26dc4fa7..2a06867de 100644
--- a/tools/topology/topology2/cavs-rt5682.conf
+++ b/tools/topology/topology2/cavs-rt5682.conf
@@ -13,6 +13,7 @@
 <passthrough-playback.conf>
 <passthrough-capture.conf>
 <passthrough-be.conf>
+<passthrough-capture-be.conf>
 <host-copier-gain-mixin-playback.conf>
 <mixout-gain-dai-copier-playback.conf>
 <deepbuffer-playback.conf>
@@ -248,7 +249,7 @@ Object.Pipeline {
 		}
 	}
 
-	passthrough-be.1 {
+	passthrough-capture-be.1 {
 		index	6
 		direction	capture
 
diff --git a/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf b/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf
index 0feaa3872..ed4c87136 100644
--- a/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf
+++ b/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf
@@ -12,7 +12,7 @@
 <src-gain-mixin-playback.conf>
 <mixout-gain-dai-copier-playback.conf>
 <passthrough-capture.conf>
-<passthrough-be.conf>
+<passthrough-capture-be.conf>
 <data.conf>
 <pcm.conf>
 <pcm_caps.conf>
@@ -114,7 +114,7 @@ Object.Pipeline {
 			in_bit_depth	32
 		}
 	}
-	passthrough-be.2 {
+	passthrough-capture-be.2 {
 		direction	"capture"
 		index 3
 		copier_type "ALH"
diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf
index cdb4f9f11..7c7c177ea 100644
--- a/tools/topology/topology2/cavs-sdw.conf
+++ b/tools/topology/topology2/cavs-sdw.conf
@@ -18,6 +18,7 @@
 <passthrough-playback.conf>
 <passthrough-capture.conf>
 <passthrough-be.conf>
+<passthrough-capture-be.conf>
 <data.conf>
 <pcm.conf>
 <pcm_caps.conf>
@@ -179,7 +180,7 @@ Object.Pipeline {
 			in_bit_depth	32
 		}
 	}
-	passthrough-be.11 {
+	passthrough-capture-be.11 {
 		direction	"capture"
 		index 11
 		copier_type "ALH"
diff --git a/tools/topology/topology2/platform/intel/bt-generic.conf b/tools/topology/topology2/platform/intel/bt-generic.conf
index 57d6e1c99..e65afb385 100644
--- a/tools/topology/topology2/platform/intel/bt-generic.conf
+++ b/tools/topology/topology2/platform/intel/bt-generic.conf
@@ -147,7 +147,7 @@ Object.Pipeline {
 		}
 	}
 
-	passthrough-be.6 {
+	passthrough-capture-be.6 {
 		index		$BT_CP_DAI_PIPELINE_ID
 		direction	"capture"
 		Object.Widget.pipeline.1 {
diff --git a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf
index e8d4ea37e..dfa3e06e9 100644
--- a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf
+++ b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf
@@ -115,7 +115,7 @@ IncludeByKey.NUM_SDW_AMPS {
 					node_type $ALH_LINK_OUTPUT_CLASS
 				}
 			}
-			passthrough-be.$ALH_2ND_SPK_IN_ID {
+			passthrough-capture-be.$ALH_2ND_SPK_IN_ID {
 				direction	"capture"
 				index $ALH_2ND_SPK_IN_ID
 				copier_type "ALH"
diff --git a/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf b/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf
index 444e78d61..d80cff6bb 100644
--- a/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf
+++ b/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf
@@ -33,7 +33,7 @@ Object.Pipeline {
 			in_bit_depth	32
 		}
 	}
-	passthrough-be.41 {
+	passthrough-capture-be.41 {
 		direction	"capture"
 		index 41
 		copier_type "ALH"
diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf
index bd17d4719..9e1151372 100644
--- a/tools/topology/topology2/sof-hda-generic.conf
+++ b/tools/topology/topology2/sof-hda-generic.conf
@@ -19,6 +19,7 @@
 <gain-capture.conf>
 <deepbuffer-playback.conf>
 <passthrough-be.conf>
+<passthrough-capture-be.conf>
 <data.conf>
 <pcm.conf>
 <pcm_caps.conf>