Tools: Topology2: Remove enum controls to unbock CI

DO NOT MERGE THIS. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
thesofproject · Sep 5, 2024 · 9dfdb06 · 9dfdb06
1 parent 4cc6c3f
commit 9dfdb06
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 88 deletions.
diff --git a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
@@ -259,9 +259,6 @@ IncludeByKey.HDA_MIC_ENHANCED_CAPTURE {
                                 mixer."1" {
                                         name 'Analog Capture TDFB beam switch'
                                 }
-                                enum."1" {
-                                        name 'Analog Capture TDFB angle set enum'
-                                }
                                 # Tracking is disabled from this topology, causes high MCPS
                                 #mixer."2" {
                                 #	 name 'Analog Capture TDFB track switch'

diff --git a/tools/topology/topology2/include/bench/tdfb_controls_capture.conf b/tools/topology/topology2/include/bench/tdfb_controls_capture.conf
@@ -14,10 +14,4 @@
 				mixer."2" {
 					name '$ANALOG_CAPTURE_PCM TDFB track'
 				}
-				enum."1" {
-					name '$ANALOG_CAPTURE_PCM TDFB angle set'
-				}
-				enum."2" {
-					name '$ANALOG_CAPTURE_PCM TDFB angle estimate'
-				}
 			}
diff --git a/tools/topology/topology2/include/bench/tdfb_controls_playback.conf b/tools/topology/topology2/include/bench/tdfb_controls_playback.conf
@@ -14,10 +14,4 @@
 				mixer."2" {
 					name '$ANALOG_PLAYBACK_PCM TDFB track'
 				}
-				enum."1" {
-					name '$ANALOG_PLAYBACK_PCM TDFB angle set'
-				}
-				enum."2" {
-					name '$ANALOG_PLAYBACK_PCM TDFB angle estimate'
-				}
 			}
diff --git a/tools/topology/topology2/include/components/tdfb.conf b/tools/topology/topology2/include/components/tdfb.conf
@@ -15,7 +15,6 @@
 # Where M is pipeline ID and N is a unique integer in the parent object.
 
 <include/controls/mixer.conf>
-<include/controls/enum.conf>
 
 Class.Widget."tdfb" {
 	#
@@ -91,75 +90,6 @@ Class.Widget."tdfb" {
                         max 1
                 }
 
-		# Enum controls
-		enum."1" {
-			Object.Base {
-				channel.1 {
-					name	"fc"
-					reg	3
-					shift	0
-				}
-				text.0 {
-					name "tdfb_enum_plus_minus_90_text"
-					!values [
-						"-90"
-						"-75"
-						"-60"
-						"-45"
-						"-30"
-						"-15"
-						"0"
-						"15"
-						"30"
-						"45"
-						"60"
-						"75"
-						"90"
-					]
-				}
-				ops.1 {
-					name	"ctl"
-					info	"enum"
-					#257 binds the mixer control to enum get/put handlers
-					get	257
-					put	257
-				}
-			}
-		}
-		enum."2" {
-			Object.Base {
-				channel.1 {
-					name	"fc"
-					reg	3
-					shift	0
-				}
-				text.0 {
-					name "mytext"
-					!values [
-						"-90"
-						"-75"
-						"-60"
-						"-45"
-						"-30"
-						"-15"
-						"0"
-						"15"
-						"30"
-						"45"
-						"60"
-						"75"
-						"90"
-					]
-				}
-				ops.1 {
-					name	"ctl"
-					info	"enum"
-					#257 binds the mixer control to enum get/put handlers
-					get	257
-					put	257
-				}
-			}
-		}
 	}
 
 	#

diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf
@@ -424,9 +424,6 @@ IncludeByKey.PASSTHROUGH {
 						mixer."1" {
 							name 'Dmic0 Capture TDFB beam switch'
 						}
-						enum."1" {
-							name 'Dmic0 Capture TDFB angle set enum'
-						}
 						# Tracking is disabled from this topology, causes high MCPS
 						#mixer."2" {
 						#	 name 'Dmic0 Capture TDFB track switch'