mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Factor out rt5645 variants Headset+Digital Mic UCM shared {en,dis}able sequences

Browse source 
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:14 -08:00 • committed by Jaroslav Kysela
parent d4aa7346b7
commit d68adb79ef
10 changed files with 47 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,31 +92,18 @@ SectionDevice."DMic".0 {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Int Mic Switch' on" <codecs/rt5645/DigitalMicEnableSeq.conf>
cset "name='Stereo1 DMIC Mux' DMIC1" cset "name='Stereo1 DMIC Mux' DMIC1"
cset "name='Stereo1 ADC2 Mux' DMIC" cset "name='Stereo1 ADC2 Mux' DMIC"
cset "name='Mono ADC L2 Mux' DMIC" cset "name='Mono ADC L2 Mux' DMIC"
cset "name='Mono ADC R2 Mux' DMIC" cset "name='Mono ADC R2 Mux' DMIC"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Sto1 ADC MIXL ADC2 Switch' on"
cset "name='Sto1 ADC MIXR ADC2 Switch' on"
cset "name='Mono ADC MIXL ADC1 Switch' off"
cset "name='Mono ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC2 Switch' on"
cset "name='Mono ADC MIXR ADC2 Switch' on"
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Sto1 ADC MIXL ADC2 Switch' off" <codecs/rt5645/DigitalMicDisableSeq.conf>
cset "name='Sto1 ADC MIXR ADC2 Switch' off"
cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='Int Mic Switch' off"
] ]
} }
@ -132,10 +119,8 @@ SectionDevice."HSMic".0 {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headset Mic Switch' on" <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='Sto1 ADC MIXL ADC1 Switch' on"
cset "name='Sto1 ADC MIXR ADC1 Switch' on"
cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXL ADC2 Switch' off"
cset "name='Sto1 ADC MIXR ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off"
@ -143,23 +128,14 @@ SectionDevice."HSMic".0 {
cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on"
cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='RECMIXL BST1 Switch' on"
cset "name='RECMIXR BST1 Switch' on"
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headset Mic Switch' off" <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='RECMIXL BST1 Switch' off"
cset "name='RECMIXR BST1 Switch' off"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXL ADC1 Switch' on"
cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on"
] ]
} }

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

@ -92,7 +92,7 @@ SectionDevice."DMic".0 {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Int Mic Switch' on" <codecs/rt5645/DigitalMicEnableSeq.conf>
cset "name='Stereo1 DMIC Mux' DMIC2" cset "name='Stereo1 DMIC Mux' DMIC2"
cset "name='Stereo1 ADC2 Mux' DMIC" cset "name='Stereo1 ADC2 Mux' DMIC"
@ -100,25 +100,12 @@ SectionDevice."DMic".0 {
cset "name='Mono DMIC R Mux' DMIC2" cset "name='Mono DMIC R Mux' DMIC2"
cset "name='Mono ADC L2 Mux' DMIC" cset "name='Mono ADC L2 Mux' DMIC"
cset "name='Mono ADC R2 Mux' DMIC" cset "name='Mono ADC R2 Mux' DMIC"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Sto1 ADC MIXL ADC2 Switch' on"
cset "name='Sto1 ADC MIXR ADC2 Switch' on"
cset "name='Mono ADC MIXL ADC1 Switch' off"
cset "name='Mono ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC2 Switch' on"
cset "name='Mono ADC MIXR ADC2 Switch' on"
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Sto1 ADC MIXL ADC2 Switch' off" <codecs/rt5645/DigitalMicDisableSeq.conf>
cset "name='Sto1 ADC MIXR ADC2 Switch' off"
cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='Int Mic Switch' off"
] ]
} }
@ -134,10 +121,8 @@ SectionDevice."HSMic".0 {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headset Mic Switch' on" <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='Sto1 ADC MIXL ADC1 Switch' on"
cset "name='Sto1 ADC MIXR ADC1 Switch' on"
cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXL ADC2 Switch' off"
cset "name='Sto1 ADC MIXR ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off"
@ -145,23 +130,14 @@ SectionDevice."HSMic".0 {
cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on"
cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='RECMIXL BST1 Switch' on"
cset "name='RECMIXR BST1 Switch' on"
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headset Mic Switch' off" <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='RECMIXL BST1 Switch' off"
cset "name='RECMIXR BST1 Switch' off"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXL ADC1 Switch' on"
cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on"
] ]
} }

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

@ -145,10 +145,8 @@ SectionDevice."HSMic".0 {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headset Mic Switch' on" <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='Sto1 ADC MIXL ADC1 Switch' on"
cset "name='Sto1 ADC MIXR ADC1 Switch' on"
cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXL ADC2 Switch' off"
cset "name='Sto1 ADC MIXR ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off"
@ -156,23 +154,14 @@ SectionDevice."HSMic".0 {
cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on"
cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='RECMIXL BST1 Switch' on"
cset "name='RECMIXR BST1 Switch' on"
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headset Mic Switch' off" <codecs/rt5645/HSMicDisableSeq.conf>
cset "name='RECMIXL BST1 Switch' off"
cset "name='RECMIXR BST1 Switch' off"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXL ADC1 Switch' on"
cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on"
] ]
} }

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

@ -136,10 +136,8 @@ SectionDevice."HSMic".0 {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headset Mic Switch' on" <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='Sto1 ADC MIXL ADC1 Switch' on"
cset "name='Sto1 ADC MIXR ADC1 Switch' on"
cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXL ADC2 Switch' off"
cset "name='Sto1 ADC MIXR ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off"
@ -147,23 +145,14 @@ SectionDevice."HSMic".0 {
cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on"
cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='RECMIXL BST1 Switch' on"
cset "name='RECMIXR BST1 Switch' on"
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645" cdev "hw:chtrt5645"
cset "name='Headset Mic Switch' off" <codecs/rt5645/HSMicDisableSeq.conf>
cset "name='RECMIXL BST1 Switch' off"
cset "name='RECMIXR BST1 Switch' off"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXL ADC1 Switch' on"
cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on"
] ]
} }

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

@ -118,22 +118,16 @@ SectionDevice."HSMic".0 {
EnableSequence [ EnableSequence [
cdev "hw:chtrt5650" cdev "hw:chtrt5650"
cset "name='Headset Mic Switch' on" <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='RECMIXL BST1 Switch' on"
cset "name='RECMIXR BST1 Switch' on"
cset "name='Sto1 ADC MIXL ADC1 Switch' on"
cset "name='Sto1 ADC MIXR ADC1 Switch' on"
cset "name='IN1 Boost' 1" cset "name='IN1 Boost' 1"
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5650" cdev "hw:chtrt5650"
cset "name='Headset Mic Switch' off" <codecs/rt5645/HSMicDisableSeq.conf>
cset "name='RECMIXL BST1 Switch' off"
cset "name='RECMIXR BST1 Switch' off"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='IN1 Boost' 0" cset "name='IN1 Boost' 0"
] ]
} }

5
src/conf/ucm/codecs/rt5645/DigitalMicDisableSeq.conf Normal file
View file

@ -0,0 +1,5 @@
cset "name='Sto1 ADC MIXL ADC2 Switch' off"
cset "name='Sto1 ADC MIXR ADC2 Switch' off"
cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='Int Mic Switch' off"

10
src/conf/ucm/codecs/rt5645/DigitalMicEnableSeq.conf Normal file
View file

@ -0,0 +1,10 @@
cset "name='Int Mic Switch' on"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Sto1 ADC MIXL ADC2 Switch' on"
cset "name='Sto1 ADC MIXR ADC2 Switch' on"
cset "name='Mono ADC MIXL ADC1 Switch' off"
cset "name='Mono ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC2 Switch' on"
cset "name='Mono ADC MIXR ADC2 Switch' on"

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

@ -0,0 +1,6 @@
cset "name='Headset Mic Switch' off"
cset "name='RECMIXL BST1 Switch' off"
cset "name='RECMIXR BST1 Switch' off"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"

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

@ -0,0 +1,7 @@
cset "name='Headset Mic Switch' on"
cset "name='Sto1 ADC MIXL ADC1 Switch' on"
cset "name='Sto1 ADC MIXR ADC1 Switch' on"
cset "name='RECMIXL BST1 Switch' on"
cset "name='RECMIXR BST1 Switch' on"

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

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