codecs/rt5640: Cleanup: Initially disable all inputs and outputs

Cleanup: no functional changes intended.

Disable all inputs and outputs from the main EnableSequence.

This allows removing some weirdness from the individual input/output
EnableSequences where they were turning controls for other inputs/outputs
then themselves off.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/codecs/rt5640/EnableSeq.conf b/ucm2/codecs/rt5640/EnableSeq.conf
index 4754df79c0a23d52676a2e2a145b53bc6ede76cb..5dc7092c101dcd1b870da25f83c560b3fc4bcd54 100644 (file)
--- a/ucm2/codecs/rt5640/EnableSeq.conf
+++ b/ucm2/codecs/rt5640/EnableSeq.conf
@@ -48,6 +48,27 @@ EnableSequence [
        cset "name='IN2 Boost' 1"
        cset "name='IN3 Boost' 8"
 
+       # Start with all controls which are used by the individual
+       # input/output Enable/DisableSequences off
+
+       cset "name='RECMIXL BST1 Switch' off"
+       cset "name='RECMIXR BST1 Switch' off"
+       cset "name='RECMIXL BST2 Switch' off"
+       cset "name='RECMIXR BST2 Switch' off"
+       cset "name='RECMIXL BST3 Switch' off"
+       cset "name='RECMIXR BST3 Switch' off"
+
+       cset "name='Stereo ADC MIXL ADC1 Switch' off"
+       cset "name='Stereo ADC MIXR ADC1 Switch' off"
+       cset "name='Stereo ADC MIXL ADC2 Switch' off"
+       cset "name='Stereo ADC MIXR ADC2 Switch' off"
+       cset "name='Mono ADC MIXL ADC1 Switch' off"
+       cset "name='Mono ADC MIXR ADC1 Switch' off"
+       cset "name='Mono ADC MIXL ADC2 Switch' off"
+       cset "name='Mono ADC MIXR ADC2 Switch' off"
+
+       cset "name='Speaker Switch' off"
+       cset "name='Headphone Switch' off"
        cset "name='Internal Mic Switch' off"
        cset "name='Headset Mic Switch' off"
 ]

diff --git a/ucm2/codecs/rt5640/HeadPhones.conf b/ucm2/codecs/rt5640/HeadPhones.conf
index a9e4d2026784d80461b7e457274bc399a23aaf2b..1f4316d249712a2200d47544588ebef65217ee42 100644 (file)
--- a/ucm2/codecs/rt5640/HeadPhones.conf
+++ b/ucm2/codecs/rt5640/HeadPhones.conf
@@ -17,7 +17,6 @@ SectionDevice."Headphones" {
                cset "name='HPO MIX HPVOL Switch'  on"
                cset "name='Headphone Switch'  on"
                cset "name='HP Channel Switch' on"
-               cset "name='Speaker Switch' off"
                cset "name='HP L Playback Switch' on"
                cset "name='HP R Playback Switch' on"
                cset "name='HP Playback Volume' 29"

diff --git a/ucm2/codecs/rt5640/IN1-InternalMic.conf b/ucm2/codecs/rt5640/IN1-InternalMic.conf
index 260df90d8109ac380ff022115424a72b4f7f683c..d7c419e629c27e5346694bfbe4b281ae03409f55 100644 (file)
--- a/ucm2/codecs/rt5640/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN1-InternalMic.conf
@@ -10,8 +10,6 @@ SectionDevice."Mic" {
 
                cset "name='RECMIXL BST1 Switch' on"
                cset "name='RECMIXR BST1 Switch' on"
-               cset "name='RECMIXL BST3 Switch' off"
-               cset "name='RECMIXR BST3 Switch' off"
 
                cset "name='Stereo ADC MIXL ADC1 Switch' on"
                cset "name='Stereo ADC MIXR ADC1 Switch' on"

diff --git a/ucm2/codecs/rt5640/IN3-InternalMic.conf b/ucm2/codecs/rt5640/IN3-InternalMic.conf
index ebd2b9c50e5158b4550e0663ebb9b13e75625215..3e330e60a4259593bdf9799904a44aa438a7d95c 100644 (file)
--- a/ucm2/codecs/rt5640/IN3-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN3-InternalMic.conf
@@ -8,8 +8,6 @@ SectionDevice."Mic" {
        EnableSequence [
                cset "name='Internal Mic Switch' on"
 
-               cset "name='RECMIXL BST1 Switch' off"
-               cset "name='RECMIXR BST1 Switch' off"
                cset "name='RECMIXL BST3 Switch' on"
                cset "name='RECMIXR BST3 Switch' on"
 

diff --git a/ucm2/codecs/rt5640/MonoSpeaker.conf b/ucm2/codecs/rt5640/MonoSpeaker.conf
index 23cf34c259e1ca675f46de6c0879734895e8faf1..5035c8d1c6fc65c3770756431634401abbd6e858 100644 (file)
--- a/ucm2/codecs/rt5640/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5640/MonoSpeaker.conf
@@ -14,7 +14,6 @@ SectionDevice."Speaker" {
                cset "name='SPOL MIX SPKVOL R Switch' on"
                cset "name='Speaker Switch' on"
                cset "name='Speaker Channel Switch' on"
-               cset "name='Headphone Switch' off"
                cset "name='Speaker L Playback Switch' on"
                cset "name='Speaker R Playback Switch' on"
                cset "name='Speaker Playback Volume' 35"

diff --git a/ucm2/codecs/rt5640/Speaker.conf b/ucm2/codecs/rt5640/Speaker.conf
index 422cfdfaf47294d1c76398c10ce36d3042fd78d2..fd74994d321e655da2405a8fdf62775a0c7bd8f5 100644 (file)
--- a/ucm2/codecs/rt5640/Speaker.conf
+++ b/ucm2/codecs/rt5640/Speaker.conf
@@ -14,7 +14,6 @@ SectionDevice."Speaker" {
                cset "name='SPOL MIX SPKVOL R Switch' off"
                cset "name='Speaker Switch' on"
                cset "name='Speaker Channel Switch' on"
-               cset "name='Headphone Switch' off"
                cset "name='Speaker L Playback Switch' on"
                cset "name='Speaker R Playback Switch' on"
                cset "name='Speaker Playback Volume' 35"