conf/ucm: bytcr-rt5651: Add support for a headset-mic on IN2

The first design with the headset-mic on IN2 rather then the
default / reference-design IN3 has shown up.

Add a new ucm/codecs/rt5651/IN2-HeadsetMic.conf snippet to deal with this
and include this in the default non board-specific bytcr-rt5651.conf.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Hans de Goede 2018-12-24 16:05:02 +01:00 committed by Takashi Iwai
parent d827856fca
commit 606350a726
7 changed files with 40 additions and 2 deletions

View file

@ -26,4 +26,5 @@ SectionVerb {
<codecs/rt5651/IN1-InternalMic.conf>
<codecs/rt5651/IN2-InternalMic.conf>
<codecs/rt5651/IN12-InternalMic.conf>
<codecs/rt5651/IN2-HeadsetMic.conf>
<codecs/rt5651/IN3-HeadsetMic.conf>

View file

@ -4,6 +4,7 @@ SectionDevice."InternalMic-IN1" {
ConflictingDevice [
"InternalMic-IN2"
"InternalMic-IN12"
"HeadsetMic-IN2"
"HeadsetMic-IN3"
]

View file

@ -4,6 +4,7 @@ SectionDevice."InternalMic-IN12" {
ConflictingDevice [
"InternalMic-IN1"
"InternalMic-IN2"
"HeadsetMic-IN2"
"HeadsetMic-IN3"
]

View file

@ -0,0 +1,33 @@
SectionDevice."HeadsetMic-IN2" {
Comment "Headset Microphone on IN2"
ConflictingDevice [
"InternalMic-IN1"
"InternalMic-IN2"
"InternalMic-IN12"
"HeadsetMic-IN3"
]
EnableSequence [
cdev "hw:bytcrrt5651"
cset "name='Headset Mic Switch' on"
cset "name='RECMIXL BST2 Switch' on"
cset "name='RECMIXR BST2 Switch' on"
cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
]
DisableSequence [
cdev "hw:bytcrrt5651"
cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
cset "name='Headset Mic Switch' off"
cset "name='RECMIXL BST2 Switch' off"
cset "name='RECMIXR BST2 Switch' off"
]
Value {
CaptureChannels "2"
JackControl "Headset Mic Jack"
}
}

View file

@ -4,6 +4,7 @@ SectionDevice."InternalMic-IN2" {
ConflictingDevice [
"InternalMic-IN1"
"InternalMic-IN12"
"HeadsetMic-IN2"
"HeadsetMic-IN3"
]

View file

@ -1,10 +1,11 @@
SectionDevice."HeadsetMic-IN3" {
Comment "Headset Microphone"
Comment "Headset Microphone on IN3"
ConflictingDevice [
"InternalMic-IN1"
"InternalMic-IN2"
"InternalMic-IN12"
"HeadsetMic-IN2"
]
EnableSequence [

View file

@ -2,5 +2,5 @@ alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/codecs/rt5651
ucm_DATA = EnableSeq.conf HeadPhones.conf HeadPhones-swapped.conf \
IN1-InternalMic.conf IN2-InternalMic.conf IN12-InternalMic.conf \
IN3-HeadsetMic.conf Speaker.conf MonoSpeaker.conf
IN2-HeadsetMic.conf IN3-HeadsetMic.conf Speaker.conf MonoSpeaker.conf
EXTRA_DIST = $(ucm_DATA)