Create device component for rt5645 Internal Analog Mic UCM

Since the Internal Analog Microphone device configuration is
identical for the rt5645 and rt5645 mono speaker UCMs, move
the entire definition to a component.

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:15 -08:00 committed by Jaroslav Kysela
parent d68adb79ef
commit b4c0a51505
4 changed files with 44 additions and 86 deletions

View file

@ -89,49 +89,7 @@ SectionDevice."Headphones" {
] ]
} }
SectionDevice."Mic".0 { <codecs/rt5645/AnalogMic.conf>
Comment "Internal Analog Microphone"
Value {
CaptureChannels "2"
CapturePriority "150"
}
EnableSequence [
cdev "hw:chtrt5645"
cset "name='Int Analog Mic Switch' on"
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 MIXR ADC2 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' on"
cset "name='Mono ADC MIXR ADC1 Switch' on"
cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='RECMIXL BST2 Switch' on"
cset "name='RECMIXR BST2 Switch' on"
]
DisableSequence [
cdev "hw:chtrt5645"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' off"
cset "name='Mono ADC MIXR ADC1 Switch' off"
cset "name='RECMIXL BST2 Switch' off"
cset "name='RECMIXR BST2 Switch' off"
cset "name='Int Analog Mic Switch' off"
]
}
SectionDevice."HSMic".0 { SectionDevice."HSMic".0 {
Comment "Headset Microphone" Comment "Headset Microphone"

View file

@ -81,48 +81,7 @@ SectionDevice."Headphones" {
] ]
} }
SectionDevice."Mic".0 { <codecs/rt5645/AnalogMic.conf>
Comment "Internal Analog Microphone"
Value {
CaptureChannels "2"
CapturePriority "150"
}
EnableSequence [
cdev "hw:chtrt5645"
cset "name='Int Analog Mic Switch' on"
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 MIXR ADC2 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' on"
cset "name='Mono ADC MIXR ADC1 Switch' on"
cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='RECMIXL BST2 Switch' on"
cset "name='RECMIXR BST2 Switch' on"
]
DisableSequence [
cdev "hw:chtrt5645"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' off"
cset "name='Mono ADC MIXR ADC1 Switch' off"
cset "name='RECMIXL BST2 Switch' off"
cset "name='RECMIXR BST2 Switch' off"
cset "name='Int Analog Mic Switch' off"
]
}
SectionDevice."HSMic".0 { SectionDevice."HSMic".0 {
Comment "Headset Microphone" Comment "Headset Microphone"

View file

@ -0,0 +1,41 @@
SectionDevice."Mic".0 {
Comment "Internal Analog Microphone"
Value {
CaptureChannels "2"
CapturePriority "150"
}
EnableSequence [
cdev "hw:chtrt5645"
cset "name='Int Analog Mic Switch' on"
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 MIXR ADC2 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' on"
cset "name='Mono ADC MIXR ADC1 Switch' on"
cset "name='Mono ADC MIXL ADC2 Switch' off"
cset "name='Mono ADC MIXR ADC2 Switch' off"
cset "name='RECMIXL BST2 Switch' on"
cset "name='RECMIXR BST2 Switch' on"
]
DisableSequence [
cdev "hw:chtrt5645"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' off"
cset "name='Mono ADC MIXR ADC1 Switch' off"
cset "name='RECMIXL BST2 Switch' off"
cset "name='RECMIXR BST2 Switch' off"
cset "name='Int Analog Mic Switch' off"
]
}

View file

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