From 660c9d2617c1b99376e997955307234804e7d4e4 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Tue, 15 Mar 2022 19:44:23 -0500
Subject: [PATCH] topology2: cavs: rename mixout-capture as
 mixout-gain-host-copier-capture

Be exhaustive on pipeline contents.

Also remove Windows references and copy/pasted comments

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 .../topology2/cavs/cavs-mixin-mixout-hda.conf        |  2 +-
 .../topology2/cavs/cavs-passthrough-hdmi.conf        |  2 +-
 ...ure.conf => mixout-gain-host-copier-capture.conf} | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename tools/topology/topology2/include/pipelines/cavs/{mixout-capture.conf => mixout-gain-host-copier-capture.conf} (81%)

diff --git a/tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf b/tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf
index c84933ad4..9387e6cf5 100644
--- a/tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf
+++ b/tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf
@@ -46,7 +46,7 @@ Object.Pipeline {
 		format s32le
 	}
 
-	mixout-capture.0 {
+	mixout-gain-host-copier-capture.0 {
 		index 3
 		Object.Widget.pipeline.1 {
 			stream_name 'copier.HDA.4.1'
diff --git a/tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf b/tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf
index 70bf2f6c3..26f04f3be 100644
--- a/tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf
+++ b/tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf
@@ -13,7 +13,7 @@
 <host-copier-gain-mixin-playback.conf>
 <mixout-gain-dai-copier-playback.conf>
 <mixin-capture.conf>
-<mixout-capture.conf>
+<mixout-gain-host-copier-capture.conf>
 <passthrough-be.conf>
 <data.conf>
 <pcm.conf>
diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-capture.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf
similarity index 81%
rename from tools/topology/topology2/include/pipelines/cavs/mixout-capture.conf
rename to tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf
index f38a81cc3..dfa9e837f 100644
--- a/tools/topology/topology2/include/pipelines/cavs/mixout-capture.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf
@@ -1,12 +1,12 @@
 #
-# mixout based FE capture pipeline
+# FE capture pipeline: mixout-gain-host-copier-capture
 #
 # All attributes defined herein are namespaced
-# by alsatplg to "Object.Pipeline.mixin-playback.N.attribute_name"
+# by alsatplg to "Object.Pipeline.mixout-gain-host-copier-capture.N.attribute_name"
 #
-# Usage: mixout-capture pipeline object can be instantiated as:
+# Usage: mixout-gain-host-copier-capture pipeline object can be instantiated as:
 #
-# Object.Pipeline.mixout-capture."N" {
+# Object.Pipeline.mixout-gain-host-copier-capture."N" {
 # 	format		"s16le"
 # 	period		1000
 # 	time_domain	"timer"
@@ -23,7 +23,7 @@
 <include/components/pipeline.conf>
 <include/components/gain.conf>
 
-Class.Pipeline."mixout-capture" {
+Class.Pipeline."mixout-gain-host-copier-capture" {
 
 	DefineAttribute."index" {}
 
@@ -43,7 +43,7 @@ Class.Pipeline."mixout-capture" {
 		]
 
 		#
-		# mixout-capture objects instantiated within the same alsaconf node must have
+		# mixout-gain-host-copier-capture objects instantiated within the same alsaconf node must have
 		# unique pipeline_id attribute
 		#
 		unique	"instance"