From 50f5c8fbdc567296170ed188dd33aa37441c70b0 Mon Sep 17 00:00:00 2001
From: Jyri Sarha <jyri.sarha@linux.intel.com>
Date: Tue, 27 Jun 2023 22:31:53 +0300
Subject: [PATCH] topology2: Rename remaining non mixer kcontrols to follow new
 naming scheme

Rename all remaining kcontrols to follow the new naming scheme that is
already used for all mixers.

This commit changes kcontrol names as follows:

cavs-nocodec.conf:
'smart_amp_init' -> 'Main Playback and Port0 smart_amp_init'

cavs-mixin-mixout-hda.conf:
'4 Main capture Iir Eq' -> 'Analog Capture IIR Eq'

dmic-generic.conf:
'DMIC0 capture Iir Eq' -> 'DMIC0 Capture IIR Eq'

sdw-jack-generic.conf:
'4 Main capture Iir Eq' -> 'Jack In Capture IIR Eq'

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
---
 tools/topology/topology2/cavs-mixin-mixout-hda.conf           | 2 +-
 tools/topology/topology2/cavs-nocodec.conf                    | 2 +-
 tools/topology/topology2/platform/intel/dmic-generic.conf     | 2 +-
 tools/topology/topology2/platform/intel/sdw-jack-generic.conf | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/topology/topology2/cavs-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
index 8e5dc10ebd6c..945f8670fb9c 100644
--- a/tools/topology/topology2/cavs-mixin-mixout-hda.conf
+++ b/tools/topology/topology2/cavs-mixin-mixout-hda.conf
@@ -102,7 +102,7 @@ Object.Pipeline {
 			}
 			Object.Widget.eqiir.1 {
 				Object.Control.bytes."1" {
-					name '4 Main capture Iir Eq'
+					name '$ANALOG_CAPTURE_PCM IIR Eq'
 				}
 			}
 		}
diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf
index 773617a473a2..f338df14f11e 100644
--- a/tools/topology/topology2/cavs-nocodec.conf
+++ b/tools/topology/topology2/cavs-nocodec.conf
@@ -236,7 +236,7 @@ IncludeByKey.PASSTHROUGH {
 					}
 
 					Object.Control.bytes."1" {
-						name smart_amp_init
+						name "Main Playback and $SSP0_PCM_NAME smart_amp_init"
 					}
 				}
 			}
diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf
index d5aa62ef70b2..2572581232c9 100644
--- a/tools/topology/topology2/platform/intel/dmic-generic.conf
+++ b/tools/topology/topology2/platform/intel/dmic-generic.conf
@@ -231,7 +231,7 @@ IncludeByKey.PASSTHROUGH {
 						out_valid_bit_depth	32
 					}
 					Object.Control.bytes."1" {
-						name 'DMIC0 capture Iir Eq'
+						name 'DMIC0 Capture IIR Eq'
 					}
 				}
 				Object.Widget.pipeline."1" {
diff --git a/tools/topology/topology2/platform/intel/sdw-jack-generic.conf b/tools/topology/topology2/platform/intel/sdw-jack-generic.conf
index 967ad26e9c63..a05a441e5db2 100644
--- a/tools/topology/topology2/platform/intel/sdw-jack-generic.conf
+++ b/tools/topology/topology2/platform/intel/sdw-jack-generic.conf
@@ -288,7 +288,7 @@ IncludeByKey.PASSTHROUGH {
 
 			Object.Control.bytes."1" {
 				<include/components/eqiir/highpass_40hz_0db_48khz.conf>
-				name '4 Main capture Iir Eq'
+				name '$JACK_CAPTURE_PCM_NAME Capture IIR Eq'
 			}
 		}
 	]