From f3533bcd423a60b3f48062fa15feed3514b5b9e8 Mon Sep 17 00:00:00 2001
From: Iuliana Prodan <iuliana.prodan@nxp.com>
Date: Thu, 15 Feb 2024 18:22:55 +0200
Subject: [PATCH] topology2: move gain-playback/capture pipelines out of cavs

Move gain-playback/capture pipelines out of cavs folder
since these can used by others.

Update cavs topologies to fix compilation by adding
include/pipelines as searchdir.

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
---
 tools/topology/topology2/cavs-es83x6.conf                       | 1 +
 tools/topology/topology2/cavs-nocodec.conf                      | 1 +
 tools/topology/topology2/cavs-rt5682.conf                       | 1 +
 tools/topology/topology2/cavs-sdw.conf                          | 1 +
 .../topology2/include/pipelines/{cavs => }/gain-capture.conf    | 2 +-
 .../topology2/include/pipelines/{cavs => }/gain-playback.conf   | 2 +-
 tools/topology/topology2/sof-hda-generic.conf                   | 1 +
 7 files changed, 7 insertions(+), 2 deletions(-)
 rename tools/topology/topology2/include/pipelines/{cavs => }/gain-capture.conf (99%)
 rename tools/topology/topology2/include/pipelines/{cavs => }/gain-playback.conf (97%)

diff --git a/tools/topology/topology2/cavs-es83x6.conf b/tools/topology/topology2/cavs-es83x6.conf
index bca029aae..03a40ee95 100644
--- a/tools/topology/topology2/cavs-es83x6.conf
+++ b/tools/topology/topology2/cavs-es83x6.conf
@@ -2,6 +2,7 @@
 <searchdir:include/common>
 <searchdir:include/components>
 <searchdir:include/dais>
+<searchdir:include/pipelines>
 <searchdir:include/pipelines/cavs>
 <searchdir:platform>
 <searchdir:platform/intel>
diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf
index ad550a031..167050668 100644
--- a/tools/topology/topology2/cavs-nocodec.conf
+++ b/tools/topology/topology2/cavs-nocodec.conf
@@ -2,6 +2,7 @@
 <searchdir:include/common>
 <searchdir:include/components>
 <searchdir:include/dais>
+<searchdir:include/pipelines>
 <searchdir:include/pipelines/cavs>
 <searchdir:platform>
 <searchdir:platform/intel>
diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
index a3895561c..396737b58 100644
--- a/tools/topology/topology2/cavs-rt5682.conf
+++ b/tools/topology/topology2/cavs-rt5682.conf
@@ -2,6 +2,7 @@
 <searchdir:include/common>
 <searchdir:include/components>
 <searchdir:include/dais>
+<searchdir:include/pipelines>
 <searchdir:include/pipelines/cavs>
 <searchdir:platform>
 <searchdir:platform/intel>
diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf
index 17c376445..c1416a95b 100644
--- a/tools/topology/topology2/cavs-sdw.conf
+++ b/tools/topology/topology2/cavs-sdw.conf
@@ -2,6 +2,7 @@
 <searchdir:include/common>
 <searchdir:include/components>
 <searchdir:include/dais>
+<searchdir:include/pipelines>
 <searchdir:include/pipelines/cavs>
 <searchdir:platform>
 <searchdir:platform/intel>
diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf b/tools/topology/topology2/include/pipelines/gain-capture.conf
similarity index 99%
rename from tools/topology/topology2/include/pipelines/cavs/gain-capture.conf
rename to tools/topology/topology2/include/pipelines/gain-capture.conf
index 1b6bb9903..66e2d7df6 100644
--- a/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf
+++ b/tools/topology/topology2/include/pipelines/gain-capture.conf
@@ -1,5 +1,5 @@
 #
-# CAVS gain (volume) capture pipeline
+# Generic gain (volume) capture pipeline
 #
 # A simple gain (volume) pipeline. All attributes defined herein are namespaced
 # by alsatplg to "Object.Pipeline.gain-capture.N.attribute_name".
diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf b/tools/topology/topology2/include/pipelines/gain-playback.conf
similarity index 97%
rename from tools/topology/topology2/include/pipelines/cavs/gain-playback.conf
rename to tools/topology/topology2/include/pipelines/gain-playback.conf
index e034cd383..425eedcec 100644
--- a/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf
+++ b/tools/topology/topology2/include/pipelines/gain-playback.conf
@@ -1,5 +1,5 @@
 #
-# CAVS gain (volume) playback pipeline
+# Generic gain (volume) playback pipeline
 #
 # A simple gain (volume) pipeline. All attributes defined herein are namespaced
 # by alsatplg to "Object.Pipeline.gain-playback.N.attribute_name"
diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf
index 2be5ac73d..aa547af25 100644
--- a/tools/topology/topology2/sof-hda-generic.conf
+++ b/tools/topology/topology2/sof-hda-generic.conf
@@ -2,6 +2,7 @@
 <searchdir:include/common>
 <searchdir:include/components>
 <searchdir:include/dais>
+<searchdir:include/pipelines>
 <searchdir:include/pipelines/cavs>
 <searchdir:platform>
 <searchdir:platform/intel>