conf/ucm: bytcr-rt5651: Change Speaker/Headphone en/disable sequences to fix switching

pulseaudio will run the DisableSequence of the current playback device
before running the EnableSequence of the new playback device.

This causes the Platform Clock and BIAS to temporarily get turned off which
on the rt5651 breaks audio-streams which are playing when switching.

This commit moves the disabling to the EnableSequence of the other device
fixing this.

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm/bytcr-rt5651/HiFi.conf b/ucm/bytcr-rt5651/HiFi.conf
index bc604276f937b0d553e584caf146cfea67d6672b..42fa2c9aa25a3d0a96cc5a48de36ac7c97821e87 100644 (file)
--- a/ucm/bytcr-rt5651/HiFi.conf
+++ b/ucm/bytcr-rt5651/HiFi.conf
@@ -30,14 +30,19 @@ SectionDevice."Headphones" {
                cset "name='Headphone Switch' on"
                cset "name='HPO L Playback Switch' on"
                cset "name='HPO R Playback Switch' on"
+               # Done after turning the HP on to keep the bias and clk on
+               cset "name='Speaker Switch' off"
+               cset "name='LOUT L Playback Switch' off"
+               cset "name='LOUT R Playback Switch' off"
        ]
 
        DisableSequence [
                cdev "hw:bytcrrt5651"
                exec "echo Headphones playback disable sequence"
-               cset "name='Headphone Switch' off"
-               cset "name='HPO L Playback Switch' off"
-               cset "name='HPO R Playback Switch' off"
+               # This is done by the Speaker EnableSequence, so that the
+               # Platform Clock and BIAS do not temporarily get turned off
+               # as that breaks audio-streams which are playing when
+               # switching between Speaker/Headphone
        ]
 
        Value {
@@ -57,12 +62,21 @@ SectionDevice."Speaker" {
                cdev "hw:bytcrrt5651"
                exec "echo Speaker enable sequence"
                cset "name='Speaker Switch' on"
+               cset "name='LOUT L Playback Switch' on"
+               cset "name='LOUT R Playback Switch' on"
+               # Done after turning the speaker on to keep the bias and clk on
+               cset "name='Headphone Switch' off"
+               cset "name='HPO L Playback Switch' off"
+               cset "name='HPO R Playback Switch' off"
        ]
 
        DisableSequence [
                cdev "hw:bytcrrt5651"
                exec "echo Speaker disable sequence"
-               cset "name='Speaker Switch' off"
+               # This is done by the Headphones EnableSequence, so that the
+               # Platform Clock and BIAS do not temporarily get turned off
+               # as that breaks audio-streams which are playing when
+               # switching between Speaker/Headphone
        ]
 
        Value {