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>

diff --git a/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf
index fddd8a3ca19ab7c696855d1f86844d8587e8f945..37bb1d40ce2bcffcdf2503ebd4e977368d05016d 100644 (file)
--- a/src/conf/ucm/bytcr-rt5651/HiFi.conf
+++ b/src/conf/ucm/bytcr-rt5651/HiFi.conf
@@ -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>

diff --git a/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf
index b2ce17b6629115e52901a890454bf6f187c5af8d..5092809f1b9547d5a518779fcfa6a344d1190672 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf
@@ -4,6 +4,7 @@ SectionDevice."InternalMic-IN1" {
        ConflictingDevice [
                "InternalMic-IN2"
                "InternalMic-IN12"
+               "HeadsetMic-IN2"
                "HeadsetMic-IN3"
        ]
 

diff --git a/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf
index e80419122745cd42ab7e59b8c7088df988a83e52..c917e85e893fc2cd2804afba1eef608bd63cf4eb 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf
@@ -4,6 +4,7 @@ SectionDevice."InternalMic-IN12" {
        ConflictingDevice [
                "InternalMic-IN1"
                "InternalMic-IN2"
+               "HeadsetMic-IN2"
                "HeadsetMic-IN3"
        ]
 

diff --git a/src/conf/ucm/codecs/rt5651/IN2-HeadsetMic.conf b/src/conf/ucm/codecs/rt5651/IN2-HeadsetMic.conf
new file mode 100644 (file)
index 0000000..b6dc081
--- /dev/null
+++ b/src/conf/ucm/codecs/rt5651/IN2-HeadsetMic.conf
@@ -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"
+       }
+}

diff --git a/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf
index 048fcc950ea610e75528391be357a6136544124f..bbb713c05ca236c6bb25ee0bb1da738405ad0835 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf
@@ -4,6 +4,7 @@ SectionDevice."InternalMic-IN2" {
        ConflictingDevice [
                "InternalMic-IN1"
                "InternalMic-IN12"
+               "HeadsetMic-IN2"
                "HeadsetMic-IN3"
        ]
 

diff --git a/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf b/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf
index 712d14bb9e2251e074abaac0d91707ec12ee6111..48f3e4632a6754b440abac386d46b3fbcc53a95e 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf
@@ -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 [

diff --git a/src/conf/ucm/codecs/rt5651/Makefile.am b/src/conf/ucm/codecs/rt5651/Makefile.am
index a68bd7bb9fcfd74158309a26d2dd07537208e44b..889b4fd42cf6ccc45ce577274698ec76037daf1a 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/Makefile.am
+++ b/src/conf/ucm/codecs/rt5651/Makefile.am
@@ -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)