mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Factor out rt5645 variants Speaker+Headphones shared UCM enable sequences

Browse source 
Move common enable sequences for rt5645 variants and rt5650
UCM configurations into a shared component. The corresponding
disable sequences are only two lines each and do not seem worth
creating components for.

Signed-off-by: Russell Parker <russell.parker7@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Russell Parker 2019-01-05 19:47:13 -08:00 • committed by Jaroslav Kysela
parent e850d8e2e3
commit d4aa7346b7
8 changed files with 25 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
View file

@ -43,12 +43,7 @@ SectionDevice."Speaker" {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headphone Switch' off" <codecs/rt5645/SpeakerEnableSeq.conf>
cset "name='Headphone Channel Switch' off"
cset "name='Ext Spk Switch' on"
cset "name='Speaker Channel Switch' on"
cset "name='Speaker Playback Volume' 31"
] ]
DisableSequence [ DisableSequence [
@ -75,13 +70,7 @@ SectionDevice."Headphones" {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Ext Spk Switch' off" <codecs/rt5645/HeadphonesEnableSeq.conf>
cset "name='Speaker Channel Switch' off"
cset "name='Headphone Switch' on"
cset "name='Headphone Channel Switch' on"
# 25/39 higher values cause crackling on some boards
cset "name='Headphone Playback Volume' 25"
] ]
DisableSequence [ DisableSequence [

15
src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
View file

@ -43,12 +43,7 @@ SectionDevice."Speaker" {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headphone Switch' off" <codecs/rt5645/SpeakerEnableSeq.conf>
cset "name='Headphone Channel Switch' off"
cset "name='Ext Spk Switch' on"
cset "name='Speaker Channel Switch' on"
cset "name='Speaker Playback Volume' 31"
] ]
DisableSequence [ DisableSequence [
@ -75,13 +70,7 @@ SectionDevice."Headphones" {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Ext Spk Switch' off" <codecs/rt5645/HeadphonesEnableSeq.conf>
cset "name='Speaker Channel Switch' off"
cset "name='Headphone Switch' on"
cset "name='Headphone Channel Switch' on"
# 25/39 higher values cause crackling on some boards
cset "name='Headphone Playback Volume' 25"
] ]
DisableSequence [ DisableSequence [

15
src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
View file

@ -47,12 +47,7 @@ SectionDevice."Speaker" {
cset "name='Stereo DAC MIXL DAC R1 Switch' 1" cset "name='Stereo DAC MIXL DAC R1 Switch' 1"
cset "name='Stereo DAC MIXR DAC R1 Switch' 0" cset "name='Stereo DAC MIXR DAC R1 Switch' 0"
cset "name='Headphone Switch' off" <codecs/rt5645/SpeakerEnableSeq.conf>
cset "name='Headphone Channel Switch' off"
cset "name='Ext Spk Switch' on"
cset "name='Speaker Channel Switch' on"
cset "name='Speaker Playback Volume' 31"
] ]
DisableSequence [ DisableSequence [
@ -83,13 +78,7 @@ SectionDevice."Headphones" {
cset "name='Stereo DAC MIXL DAC R1 Switch' 0" cset "name='Stereo DAC MIXL DAC R1 Switch' 0"
cset "name='Stereo DAC MIXR DAC R1 Switch' 1" cset "name='Stereo DAC MIXR DAC R1 Switch' 1"
cset "name='Ext Spk Switch' off" <codecs/rt5645/HeadphonesEnableSeq.conf>
cset "name='Speaker Channel Switch' off"
cset "name='Headphone Switch' on"
cset "name='Headphone Channel Switch' on"
# 25/39 higher values cause crackling on some boards
cset "name='Headphone Playback Volume' 25"
] ]
DisableSequence [ DisableSequence [

15
src/conf/ucm/chtrt5645/HiFi.conf
View file

@ -43,12 +43,7 @@ SectionDevice."Speaker" {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headphone Switch' off" <codecs/rt5645/SpeakerEnableSeq.conf>
cset "name='Headphone Channel Switch' off"
cset "name='Ext Spk Switch' on"
cset "name='Speaker Channel Switch' on"
cset "name='Speaker Playback Volume' 31"
] ]
DisableSequence [ DisableSequence [
@ -75,13 +70,7 @@ SectionDevice."Headphones" {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Ext Spk Switch' off" <codecs/rt5645/HeadphonesEnableSeq.conf>
cset "name='Speaker Channel Switch' off"
cset "name='Headphone Switch' on"
cset "name='Headphone Channel Switch' on"
# 25/39 higher values cause crackling on some boards
cset "name='Headphone Playback Volume' 25"
] ]
DisableSequence [ DisableSequence [

14
src/conf/ucm/chtrt5650/HiFi.conf
View file

@ -43,12 +43,7 @@ SectionDevice."Speaker" {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5650" cdev "hw:chtrt5650"
cset "name='Headphone Switch' off" <codecs/rt5645/SpeakerEnableSeq.conf>
cset "name='Headphone Channel Switch' off"
cset "name='Ext Spk Switch' on"
cset "name='Speaker Channel Switch' on"
cset "name='Speaker Playback Volume' 31"
] ]
DisableSequence [ DisableSequence [
@ -75,12 +70,7 @@ SectionDevice."Headphones" {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5650" cdev "hw:chtrt5650"
cset "name='Ext Spk Switch' off" <codecs/rt5645/HeadphonesEnableSeq.conf>
cset "name='Speaker Channel Switch' off"
cset "name='Headphone Switch' on"
cset "name='Headphone Channel Switch' on"
cset "name='Headphone Playback Volume' 31"
] ]
DisableSequence [ DisableSequence [

7
src/conf/ucm/codecs/rt5645/HeadphonesEnableSeq.conf Normal file
View file

@ -0,0 +1,7 @@
cset "name='Ext Spk Switch' off"
cset "name='Speaker Channel Switch' off"
cset "name='Headphone Switch' on"
cset "name='Headphone Channel Switch' on"
# 25/39 higher values cause crackling on some boards
cset "name='Headphone Playback Volume' 25"

3
src/conf/ucm/codecs/rt5645/Makefile.am
View file

@ -1,4 +1,5 @@
alsaconfigdir = @ALSA_CONFIG_DIR@ alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/codecs/rt5645 ucmdir = $(alsaconfigdir)/ucm/codecs/rt5645
ucm_DATA = DisableSeq.conf EnableSeq.conf ucm_DATA = DisableSeq.conf EnableSeq.conf HeadphonesEnableSeq.conf \
SpeakerEnableSeq.conf
EXTRA_DIST = $(ucm_DATA) EXTRA_DIST = $(ucm_DATA)

6
src/conf/ucm/codecs/rt5645/SpeakerEnableSeq.conf Normal file
View file

@ -0,0 +1,6 @@
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' 31"