conf/ucm: chtrt5645: Cleanup and playback fixes

Apply cleanup and playback fixes changes from:
https://github.com/plbossart/UCM.git

Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
[hdegoede@redhat.com: Modify commit msg and paths for merging into alsa-lib]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Pierre-Louis Bossart 2018-04-28 21:51:56 +02:00 committed by Takashi Iwai
parent 81db276f8c
commit f7c38c29d1

View file

@ -11,51 +11,146 @@ SectionVerb {
EnableSequence [
cdev "hw:chtrt5645"
# Enable audio output path
cset "name='codec_out1 mix 0 pcm0_in Switch' on"
cset "name='media0_out mix 0 media1_in Switch' on"
# media mixer settings
# compress
cset "name='media0_in Gain 0 Switch' on"
cset "name='media0_in Gain 0 Volume' 0"
cset "name='media1_in Gain 0 Ramp Delay' 50"
# normal
cset "name='media1_in Gain 0 Switch' on"
cset "name='media1_in Gain 0 Volume' 80% 80%"
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 Ramp Delay' 50"
cset "name='pcm0_in Gain 0 Switch' on"
cset "name='pcm0_in Gain 0 Volume' 80% 80%"
cset "name='pcm0_in Gain 0 Volume' 0"
cset "name='codec_out1 Gain 0 Ramp Delay' 50"
cset "name='codec_out1 Gain 0 Switch' on"
cset "name='codec_out1 Gain 0 Volume' 70% 70%"
cset "name='pcm1_in Gain 0 Switch' off"
cset "name='pcm1_in Gain 0 Volume' 0%"
# Enable audio input path
cset "name='pcm1_out mix 0 media_loop2_in Switch' on"
cset "name='media_loop2_out mix 0 codec_in0 Switch' on"
# codec0_out settings (used if ssp2 is connected to aif1)
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"
cset "name='codec_in0 Gain 0 Ramp Delay' 50"
# modem_out settings (used if ssp0 is connected to aif2)
cset "name='modem_out mix 0 codec_in0 Switch' off"
cset "name='modem_out mix 0 codec_in1 Switch' off"
cset "name='modem_out mix 0 media_loop1_in Switch' off"
cset "name='modem_out mix 0 media_loop2_in Switch' off"
cset "name='modem_out mix 0 pcm0_in Switch' on"
cset "name='modem_out mix 0 pcm1_in Switch' off"
cset "name='modem_out mix 0 sprot_loop_in Switch' off"
cset "name='modem_out Gain 0 Switch' on"
cset "name='modem_out Gain 0 Volume' 0"
# input settings
# pcm1_out settings
# input used when SSP2 is connected
cset "name='codec_in0 Gain 0 Switch' on"
cset "name='codec_in0 Gain 0 Volume' 80% 80%"
cset "name='codec_in0 Gain 0 Volume' 0"
cset "name='media_loop2_out Gain 0 Ramp Delay' 50"
cset "name='media_loop2_out Gain 0 Switch' on"
cset "name='media_loop2_out Gain 0 Volume' 80% 80%"
# input used when SSP0 is connected
cset "name='modem_in Gain 0 Switch' on"
cset "name='modem_in Gain 0 Volume' 0"
cset "name='pcm1_out mix 0 codec_in0 Switch' on"
cset "name='pcm1_out mix 0 modem_in 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 Ramp Delay' 50"
cset "name='pcm1_out Gain 0 Switch' on"
cset "name='pcm1_out Gain 0 Volume' 80% 80%"
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"
# Output Configuration
cset "name='DAC L2 Mux' 'IF1 DAC'"
cset "name='DAC R2 Mux' 'IF1 DAC'"
cset "name='DAC1 L Mux' IF1 DAC"
cset "name='DAC1 R Mux' IF1 DAC"
cset "name='DAC1 MIXL DAC1 Switch' 1"
cset "name='DAC1 MIXR DAC1 Switch' 1"
cset "name='Stereo DAC MIXL DAC L1 Switch' 1"
cset "name='Stereo DAC MIXR DAC R1 Switch' 1"
cset "name='DAC L2 Mux' IF2 DAC"
cset "name='DAC R2 Mux' IF2 DAC"
cset "name='Mono DAC MIXL DAC L2 Switch' on"
cset "name='Mono DAC MIXR DAC R2 Switch' on"
cset "name='DAC2 Playback Switch' on"
cset "name='HPOVOL MIXL DAC1 Switch' on"
cset "name='HPOVOL MIXR DAC1 Switch' on"
cset "name='HPOVOL MIXL DAC2 Switch' on"
cset "name='HPOVOL MIXR DAC2 Switch' on"
cset "name='HPO MIX HPVOL Switch' on"
cset "name='HPOVOL L Switch' on"
cset "name='HPOVOL R Switch' on"
cset "name='SPK MIXL DAC L1 Switch' on"
cset "name='SPK MIXR DAC R1 Switch' on"
cset "name='SPK MIXL DAC L2 Switch' on"
cset "name='SPK MIXR DAC R2 Switch' on"
cset "name='SPOL MIX SPKVOL L Switch' on"
@ -105,15 +200,18 @@ SectionDevice."Speaker" {
}
ConflictingDevice [
"Headphone"
"Headphones"
]
EnableSequence [
cdev "hw:chtrt5645"
cset "name='Headphone Switch' off"
cset "name='Headphone Channel Switch' off"
cset "name='Ext Spk Switch' on"
cset "name='Speaker Channel Switch' on"
cset "name='Speaker Playback Volume' 39"
cset "name='Speaker Playback Volume' 31"
]
DisableSequence [
@ -124,7 +222,7 @@ SectionDevice."Speaker" {
]
}
SectionDevice."Headphone".0 {
SectionDevice."Headphones" {
Comment "Headphones"
Value {
@ -140,9 +238,12 @@ SectionDevice."Headphone".0 {
EnableSequence [
cdev "hw:chtrt5645"
cset "name='Ext Spk Switch' off"
cset "name='Speaker Channel Switch' off"
cset "name='Headphone Switch' on"
cset "name='Headphone Channel Switch' on"
cset "name='Headphone Playback Volume' 39"
cset "name='Headphone Playback Volume' 31"
]
DisableSequence [