From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Sun, 3 Apr 2022 11:13:00 +0000 (-0300)
Subject: ucm2: sof-essx8336: drop conditional control settings
X-Git-Tag: v1.2.7~19
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=9d3e2040ac4d3731c2349d4d2384071ff22f56dd;p=alsa-ucm-conf.git

ucm2: sof-essx8336: drop conditional control settings

The Headphone controls are used by both speaker and headphone,
due to that, can't be used to detect if the device has Speaker
and/or headphones.

Also, all such controls are already initialized during the
BootSequence.

So, just drop them.

Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/144
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/Intel/sof-essx8336/sof-essx8336.conf b/ucm2/Intel/sof-essx8336/sof-essx8336.conf
index 91b8400..da92e31 100644
--- a/ucm2/Intel/sof-essx8336/sof-essx8336.conf
+++ b/ucm2/Intel/sof-essx8336/sof-essx8336.conf
@@ -39,28 +39,6 @@ SectionUseCase."HiFi" {
 	File "/Intel/sof-essx8336/HiFi.conf"
 	Comment "Play and record HiFi quality Music"
 }
-
-# the kcontrols initial values, which will be set by `alsactl init`
-If.speaker {
-	Condition {
-		Type ControlExists
-		Control "DAC Playback Volume"
-	}
-	True.BootSequence [
-		cset "name='DAC Playback Volume' 60%"
-	]
-}
-
-If.headphone {
-	Condition {
-		Type ControlExists
-		Control "name='Headphone Playback Volume'"
-	}
-	True.BootSequence [
-		cset "name='Headphone Playback Volume' 60%"
-	]
-}
-
 If.dmic {
 	Condition {
 		Type String
@@ -77,12 +55,3 @@ If.dmic {
 	}
 }
 
-If.Capture {
-	Condition {
-		Type ControlExists
-		Control "name='ADC Capture Volume'"
-	}
-	True.BootSequence [
-		cset "name='ADC Capture Volume' 60%"
-	]
-}