diff options
author | Hans de Goede <hdegoede@redhat.com> | 2021-03-08 23:05:49 +0100 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2021-03-10 11:04:01 +0100 |
commit | 55b8ef83ea98e48ff8491566cc61ee9b0679f11c (patch) | |
tree | 22425a0467e16c90e2d0686d1136f3e25e1b210a | |
parent | b1fd392b11e0e05165fe0ee00036c6849e1c037d (diff) |
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>
-rw-r--r-- | ucm2/codecs/rt5640/EnableSeq.conf | 21 | ||||
-rw-r--r-- | ucm2/codecs/rt5640/HeadPhones.conf | 1 | ||||
-rw-r--r-- | ucm2/codecs/rt5640/IN1-InternalMic.conf | 2 | ||||
-rw-r--r-- | ucm2/codecs/rt5640/IN3-InternalMic.conf | 2 | ||||
-rw-r--r-- | ucm2/codecs/rt5640/MonoSpeaker.conf | 1 | ||||
-rw-r--r-- | ucm2/codecs/rt5640/Speaker.conf | 1 |
6 files changed, 21 insertions, 7 deletions
diff --git a/ucm2/codecs/rt5640/EnableSeq.conf b/ucm2/codecs/rt5640/EnableSeq.conf index 4754df7..5dc7092 100644 --- 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 a9e4d20..1f4316d 100644 --- 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 260df90..d7c419e 100644 --- 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 ebd2b9c..3e330e6 100644 --- 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 23cf34c..5035c8d 100644 --- 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 422cfdf..fd74994 100644 --- 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" |