mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-16 06:59:57 -05:00
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>
This commit is contained in:
Hans de Goede
Jaroslav Kysela
parent
0471cc8737
commit
1bcb531923
6 changed files with 55 additions and 138 deletions
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ PandaBoardES \
|
|||
PAZ00 \
|
||||
PIPO-W2S-Defaultstring-CherryTrailCR \
|
||||
rt5640 \
|
||||
rt5651 \
|
||||
SDP4430 \
|
||||
skylake-rt286 \
|
||||
TECLAST-X80Pro-Defaultstring-CherryTrailCR \
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
]
|
||||
|
|
|
|||
46
src/conf/ucm/rt5651/EnableSeq.conf
Normal file
46
src/conf/ucm/rt5651/EnableSeq.conf
Normal file
|
|
@ -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"
|
||||
4
src/conf/ucm/rt5651/Makefile.am
Normal file
4
src/conf/ucm/rt5651/Makefile.am
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
alsaconfigdir = @ALSA_CONFIG_DIR@
|
||||
ucmdir = $(alsaconfigdir)/ucm/rt5651
|
||||
ucm_DATA = EnableSeq.conf
|
||||
EXTRA_DIST = $(ucm_DATA)
|
||||
Loading…
Add table
Add a link
Reference in a new issue