codecs/rt5640: Cleanup: Move 'SPK MIX' setup to main EnableSequene

Cleanup: no functional changes intended.

Do the 'SPK MIXL' / 'SPK MIXR' setup only once from the main
EnableSequene, like we do for the 'OUT MIXL' / 'OUT MIXR' setup
used by the headphones already.

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 5dc7092..4a355a5 100644 (file)
--- a/ucm2/codecs/rt5640/EnableSeq.conf
+++ b/ucm2/codecs/rt5640/EnableSeq.conf
@@ -6,8 +6,10 @@ EnableSequence [
        cset "name='Stereo DAC MIXR DAC R1 Switch' on"
        cset "name='Stereo DAC MIXL DAC L2 Switch' on"
        cset "name='Stereo DAC MIXR DAC R2 Switch' on"
-       cset "name='OUT MIXL DAC L1 Switch'  on"
-       cset "name='OUT MIXR DAC R1 Switch'  on"
+       cset "name='OUT MIXL DAC L1 Switch' on"
+       cset "name='OUT MIXR DAC R1 Switch' on"
+       cset "name='SPK MIXL DAC L1 Switch' on"
+       cset "name='SPK MIXR DAC R1 Switch' on"
 
        # uncomment for loopback mic->speakers
        # cset "name='SPOL MIX BST1 Switch' on"

diff --git a/ucm2/codecs/rt5640/MonoSpeaker.conf b/ucm2/codecs/rt5640/MonoSpeaker.conf
index 5035c8d..654edc3 100644 (file)
--- a/ucm2/codecs/rt5640/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5640/MonoSpeaker.conf
@@ -6,8 +6,6 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cset "name='SPK MIXL DAC L1 Switch' on"
-               cset "name='SPK MIXR DAC R1 Switch' on"
                cset "name='SPOL MIX SPKVOL L Switch' on"
 # for mono speaker we apply left on right
 #              cset "name='SPOR MIX SPKVOL R Switch' on"

diff --git a/ucm2/codecs/rt5640/Speaker.conf b/ucm2/codecs/rt5640/Speaker.conf
index fd74994..3264cc3 100644 (file)
--- a/ucm2/codecs/rt5640/Speaker.conf
+++ b/ucm2/codecs/rt5640/Speaker.conf
@@ -6,8 +6,6 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cset "name='SPK MIXL DAC L1 Switch' on"
-               cset "name='SPK MIXR DAC R1 Switch' on"
                cset "name='SPOL MIX SPKVOL L Switch' on"
                cset "name='SPOR MIX SPKVOL R Switch' on"
                # undo MonoSpeaker mixing of right channel to left speaker