conf/ucm: bytcr-rt5651: Use generic SSP enable + disable sequence, support SSP0

Use the generic SSP enable sequence from bytcr/PlatformEnableSeq.conf,
for boards using SSP2 this is identical the code it replaces and this
adds support for boards using SSP0.

This fixes sound not working on Bay Trail CR tablets with a rt5651 codec.

This commit also calls the generic disable sequence on shutdown
(this is new).

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/configure.ac b/configure.ac
index adc654e2de30d24c62363af74e923d8898edaea9..85a6be809edb606e08d8674ce9f2729c918961a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -747,6 +747,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
          src/conf/ucm/PAZ00/Makefile \
          src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/Makefile \
          src/conf/ucm/rt5640/Makefile \
+         src/conf/ucm/rt5651/Makefile \
          src/conf/ucm/SDP4430/Makefile \
          src/conf/ucm/skylake-rt286/Makefile \
          src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/Makefile \

diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
index 1e51f73e819b0b84d45c8e3b6762af26b0bccf6a..669e98d5930f70ed5a4a7ce763d2e2687401dde8 100644 (file)
--- a/src/conf/ucm/Makefile.am
+++ b/src/conf/ucm/Makefile.am
@@ -29,6 +29,7 @@ PandaBoardES \
 PAZ00 \
 PIPO-W2S-Defaultstring-CherryTrailCR \
 rt5640 \
+rt5651 \
 SDP4430 \
 skylake-rt286 \
 TECLAST-X80Pro-Defaultstring-CherryTrailCR \

diff --git a/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf
index 42fa2c9aa25a3d0a96cc5a48de36ac7c97821e87..fd878f4a8ad2a3358ea05a6f167901439109548f 100644 (file)
--- a/src/conf/ucm/bytcr-rt5651/HiFi.conf
+++ b/src/conf/ucm/bytcr-rt5651/HiFi.conf
@@ -3,12 +3,13 @@
 SectionVerb {
        EnableSequence [
                cdev "hw:bytcrrt5651"
-               exec "echo HiFi enable sequence"
+               <bytcr/PlatformEnableSeq.conf>
+               <rt5651/EnableSeq.conf>
        ]
 
        DisableSequence [
                cdev "hw:bytcrrt5651"
-               exec "echo HiFi disable sequence"
+               <bytcr/PlatformDisableSeq.conf>
        ]
 
        Value {

diff --git a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf
index d3148b3dce65f97cfcbb60774a9f4b4b0f25cb2a..45889d82ef474ccdc0c0700322e8294058a6f9be 100644 (file)
--- a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf
+++ b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf
@@ -7,140 +7,4 @@ SectionUseCase."HiFi" {
 
 SectionDefaults [
        cdev "hw:bytcrrt5651"
-
-       # media mixer settings
-       #   compress
-       cset "name='media0_in Gain 0 Switch' on"
-       cset "name='media0_in Gain 0 Volume' 0"
-       #   normal
-       cset "name='media1_in Gain 0 Switch' on"
-       cset "name='media1_in Gain 0 Volume' 0"
-       #   swm loopback
-       cset "name='media2_in Gain 0 Switch' off"
-       cset "name='media2_in Gain 0 Volume' 0%"
-       #   deep buffer
-       cset "name='media3_in Gain 0 Switch' on"
-       cset "name='media3_in Gain 0 Volume' 0"
-       cset "name='media0_out mix 0 media0_in Switch' on"
-       cset "name='media0_out mix 0 media1_in Switch' on"
-       cset "name='media0_out mix 0 media2_in Switch' off"
-       cset "name='media0_out mix 0 media3_in Switch' on"
-       cset "name='media1_out mix 0 media0_in Switch' off"
-       cset "name='media1_out mix 0 media1_in Switch' off"
-       cset "name='media1_out mix 0 media2_in Switch' off"
-       cset "name='media1_out mix 0 media3_in Switch' off"
-       cset "name='pcm0_in Gain 0 Switch' on"
-       cset "name='pcm0_in Gain 0 Volume' 0"
-       cset "name='pcm1_in Gain 0 Switch' off"
-       cset "name='pcm1_in Gain 0 Volume' 0%"
-
-       # codec0_out settings
-       cset "name='codec_out0 mix 0 codec_in0 Switch' off"
-       cset "name='codec_out0 mix 0 codec_in1 Switch' off"
-       cset "name='codec_out0 mix 0 media_loop1_in Switch' off"
-       cset "name='codec_out0 mix 0 media_loop2_in Switch' off"
-       cset "name='codec_out0 mix 0 pcm0_in Switch' on"
-       cset "name='codec_out0 mix 0 pcm1_in Switch' off"
-       cset "name='codec_out0 mix 0 sprot_loop_in Switch' off"
-       cset "name='codec_out0 Gain 0 Switch' on"
-       cset "name='codec_out0 Gain 0 Volume' 0"
-
-       # input settings
-       # pcm1_out settings
-       cset "name='codec_in0 Gain 0 Switch' on"
-       cset "name='codec_in0 Gain 0 Volume' 0"
-       cset "name='pcm1_out mix 0 codec_in0 Switch' on"
-       cset "name='pcm1_out mix 0 codec_in1 Switch' off"
-       cset "name='pcm1_out mix 0 media_loop1_in Switch' off"
-       cset "name='pcm1_out mix 0 media_loop2_in Switch' off"
-       cset "name='pcm1_out mix 0 pcm0_in Switch' off"
-       cset "name='pcm1_out mix 0 pcm1_in Switch' off"
-       cset "name='pcm1_out mix 0 sprot_loop_in Switch' off"
-       cset "name='pcm1_out Gain 0 Switch' on"
-       cset "name='pcm1_out Gain 0 Volume' 0"
-
-       # disable codec_out1
-       cset "name='codec_out1 mix 0 codec_in0 Switch' off"
-       cset "name='codec_out1 mix 0 codec_in1 Switch' off"
-       cset "name='codec_out1 mix 0 media_loop1_in Switch' off"
-       cset "name='codec_out1 mix 0 media_loop2_in Switch' off"
-       cset "name='codec_out1 mix 0 pcm0_in Switch' off"
-       cset "name='codec_out1 mix 0 pcm1_in Switch' off"
-       cset "name='codec_out1 mix 0 sprot_loop_in Switch' off"
-       cset "name='codec_out1 Gain 0 Switch' off"
-       cset "name='codec_out1 Gain 0 Volume' 0%"
-
-       # disable codec_in1
-       cset "name='codec_in1 Gain 0 Switch' off"
-       cset "name='codec_in1 Gain 0 Volume' 0%"
-
-       # disable all loops
-       cset "name='media_loop1_out mix 0 codec_in0 Switch' off"
-       cset "name='media_loop1_out mix 0 codec_in1 Switch' off"
-       cset "name='media_loop1_out mix 0 media_loop1_in Switch' off"
-       cset "name='media_loop1_out mix 0 media_loop2_in Switch' off"
-       cset "name='media_loop1_out mix 0 pcm0_in Switch' off"
-       cset "name='media_loop1_out mix 0 pcm1_in Switch' off"
-       cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off"
-       cset "name='media_loop2_out mix 0 codec_in0 Switch' off"
-       cset "name='media_loop2_out mix 0 codec_in1 Switch' off"
-       cset "name='media_loop2_out mix 0 media_loop1_in Switch' off"
-       cset "name='media_loop2_out mix 0 media_loop2_in Switch' off"
-       cset "name='media_loop2_out mix 0 pcm0_in Switch' off"
-       cset "name='media_loop2_out mix 0 pcm1_in Switch' off"
-       cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off"
-       cset "name='sprot_loop_out mix 0 codec_in0 Switch' off"
-       cset "name='sprot_loop_out mix 0 codec_in1 Switch' off"
-       cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off"
-       cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off"
-       cset "name='sprot_loop_out mix 0 pcm0_in Switch' off"
-       cset "name='sprot_loop_out mix 0 pcm1_in Switch' off"
-       cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off"
-
-       # default state
-       cset "name='HPO MIX DAC1 Switch' on"
-       cset "name='HPO MIX HPVOL Switch' off"
-       cset "name='HPO L Playback Switch' off"
-       cset "name='HPO R Playback Switch' off"
-       cset "name='HPOVOL L Switch' on"
-       cset "name='HPOVOL R Switch' on"
-       cset "name='LOUT MIX DAC L1 Switch' on"
-       cset "name='LOUT MIX DAC R1 Switch' on"
-       cset "name='IN1 Boost' 1"
-       cset "name='IN2 Boost' 1"
-       cset "name='IF1 ASRC Switch' on"
-       cset "name='LOUT L Playback Switch' off"
-       cset "name='LOUT R Playback Switch' off"
-       cset "name='Stereo DAC MIXL DAC L1 Switch' on"
-       cset "name='Stereo DAC MIXR DAC R1 Switch' on"
-       cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
-       cset "name='Stereo1 ADC MIXR ADC2 Switch' on"
-       cset "name='Stereo2 ADC MIXL ADC1 Switch' on"
-       cset "name='Stereo2 ADC MIXL ADC2 Switch' on"
-       cset "name='Stereo2 ADC MIXR ADC1 Switch' on"
-       cset "name='Stereo2 ADC MIXR ADC2 Switch' on"
-       cset "name='Headphone Switch' off"
-       cset "name='Speaker Switch' off"
-
-       # volumes for 0dB
-       cset "name='OUT Playback Volume' 31"
-       cset "name='HP Playback Volume' 31"
-       cset "name='IN Capture Volume' 23"
-       cset "name='ADC Capture Volume' 47"
-       cset "name='DAC1 Playback Volume' 175"
-
-       # input
-       cset "name='Stereo1 ADC L1 Mux' ADC"
-       cset "name='Stereo1 ADC R1 Mux' ADC"
-       cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
-       cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
-       cset "name='RECMIXL BST1 Switch' off"
-       cset "name='RECMIXR BST1 Switch' off"
-       cset "name='RECMIXL BST3 Switch' off"
-       cset "name='RECMIXR BST3 Switch' off"
-       cset "name='RECMIXL BST2 Switch' off"
-       cset "name='RECMIXR BST2 Switch' off"
-       cset "name='Headset Mic Switch' off"
-       cset "name='Internal Mic Switch' off"
-       cset "name='Line In Switch' off"
 ]

diff --git a/src/conf/ucm/rt5651/EnableSeq.conf b/src/conf/ucm/rt5651/EnableSeq.conf
new file mode 100644 (file)
index 0000000..3ef9afc
--- /dev/null
+++ b/src/conf/ucm/rt5651/EnableSeq.conf
@@ -0,0 +1,46 @@
+# default state
+cset "name='HPO MIX DAC1 Switch' on"
+cset "name='HPO MIX HPVOL Switch' off"
+cset "name='HPO L Playback Switch' off"
+cset "name='HPO R Playback Switch' off"
+cset "name='HPOVOL L Switch' on"
+cset "name='HPOVOL R Switch' on"
+cset "name='LOUT MIX DAC L1 Switch' on"
+cset "name='LOUT MIX DAC R1 Switch' on"
+cset "name='IN1 Boost' 1"
+cset "name='IN2 Boost' 1"
+cset "name='IF1 ASRC Switch' on"
+cset "name='LOUT L Playback Switch' off"
+cset "name='LOUT R Playback Switch' off"
+cset "name='Stereo DAC MIXL DAC L1 Switch' on"
+cset "name='Stereo DAC MIXR DAC R1 Switch' on"
+cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
+cset "name='Stereo1 ADC MIXR ADC2 Switch' on"
+cset "name='Stereo2 ADC MIXL ADC1 Switch' on"
+cset "name='Stereo2 ADC MIXL ADC2 Switch' on"
+cset "name='Stereo2 ADC MIXR ADC1 Switch' on"
+cset "name='Stereo2 ADC MIXR ADC2 Switch' on"
+cset "name='Headphone Switch' off"
+cset "name='Speaker Switch' off"
+
+# volumes for 0dB
+cset "name='OUT Playback Volume' 31"
+cset "name='HP Playback Volume' 31"
+cset "name='IN Capture Volume' 23"
+cset "name='ADC Capture Volume' 47"
+cset "name='DAC1 Playback Volume' 175"
+
+# input
+cset "name='Stereo1 ADC L1 Mux' ADC"
+cset "name='Stereo1 ADC R1 Mux' ADC"
+cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
+cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
+cset "name='RECMIXL BST1 Switch' off"
+cset "name='RECMIXR BST1 Switch' off"
+cset "name='RECMIXL BST3 Switch' off"
+cset "name='RECMIXR BST3 Switch' off"
+cset "name='RECMIXL BST2 Switch' off"
+cset "name='RECMIXR BST2 Switch' off"
+cset "name='Headset Mic Switch' off"
+cset "name='Internal Mic Switch' off"
+cset "name='Line In Switch' off"

diff --git a/src/conf/ucm/rt5651/Makefile.am b/src/conf/ucm/rt5651/Makefile.am
new file mode 100644 (file)
index 0000000..8a22159
--- /dev/null
+++ b/src/conf/ucm/rt5651/Makefile.am
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/rt5651
+ucm_DATA = EnableSeq.conf
+EXTRA_DIST = $(ucm_DATA)