conf/ucm: bytcr-rt5651: Add digital mic support

Add a new ucm/codecs/rt5651/DigitalMic.conf snippet for digital mic support
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 37bb1d4..8fcc5a8 100644 (file)
--- a/src/conf/ucm/bytcr-rt5651/HiFi.conf
+++ b/src/conf/ucm/bytcr-rt5651/HiFi.conf
@@ -23,6 +23,7 @@ SectionVerb {
 <codecs/rt5651/MonoSpeaker.conf>
 <codecs/rt5651/HeadPhones.conf>
 
+<codecs/rt5651/DigitalMic.conf>
 <codecs/rt5651/IN1-InternalMic.conf>
 <codecs/rt5651/IN2-InternalMic.conf>
 <codecs/rt5651/IN12-InternalMic.conf>

diff --git a/src/conf/ucm/codecs/rt5651/DigitalMic.conf b/src/conf/ucm/codecs/rt5651/DigitalMic.conf
new file mode 100644 (file)
index 0000000..63ffa9d
--- /dev/null
+++ b/src/conf/ucm/codecs/rt5651/DigitalMic.conf
@@ -0,0 +1,29 @@
+SectionDevice."DigitalMic" {
+       Comment "Internal Digital Microphone"
+
+       ConflictingDevice [
+               "InternalMic-IN1"
+               "InternalMic-IN2"
+               "InternalMic-IN12"
+               "HeadsetMic-IN2"
+               "HeadsetMic-IN3"
+       ]
+
+       EnableSequence [
+               cdev "hw:bytcrrt5651"
+               cset "name='Stereo1 ADC MIXL ADC2 Switch' on"
+               cset "name='Stereo1 ADC MIXR ADC2 Switch' on"
+               cset "name='Internal Mic Switch' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:bytcrrt5651"
+               cset "name='Stereo1 ADC MIXL ADC2 Switch' off"
+               cset "name='Stereo1 ADC MIXR ADC2 Switch' off"
+               cset "name='Internal Mic Switch' off"
+       ]
+
+       Value {
+               CaptureChannels 2
+       }
+}

diff --git a/src/conf/ucm/codecs/rt5651/EnableSeq.conf b/src/conf/ucm/codecs/rt5651/EnableSeq.conf
index db2fd32..9c1386f 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/EnableSeq.conf
+++ b/src/conf/ucm/codecs/rt5651/EnableSeq.conf
@@ -43,6 +43,8 @@ cset "name='IN3 Boost' 1"
 # input
 cset "name='Stereo1 ADC L1 Mux' ADC"
 cset "name='Stereo1 ADC R1 Mux' ADC"
+cset "name='Stereo1 ADC L2 Mux' DMIC"
+cset "name='Stereo1 ADC R2 Mux' DMIC"
 cset "name='RECMIXL BST1 Switch' off"
 cset "name='RECMIXR BST1 Switch' off"
 cset "name='RECMIXL BST3 Switch' off"

diff --git a/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf
index 5092809..12ab5cb 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf
@@ -2,6 +2,7 @@ SectionDevice."InternalMic-IN1" {
        Comment "Internal Microphone on IN1"
 
        ConflictingDevice [
+               "DigitalMic"
                "InternalMic-IN2"
                "InternalMic-IN12"
                "HeadsetMic-IN2"

diff --git a/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf
index c917e85..c4290b7 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf
@@ -2,6 +2,7 @@ SectionDevice."InternalMic-IN12" {
        Comment "Internal Microphones on IN1 and IN2"
 
        ConflictingDevice [
+               "DigitalMic"
                "InternalMic-IN1"
                "InternalMic-IN2"
                "HeadsetMic-IN2"

diff --git a/src/conf/ucm/codecs/rt5651/IN2-HeadsetMic.conf b/src/conf/ucm/codecs/rt5651/IN2-HeadsetMic.conf
index b6dc081..8759c27 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN2-HeadsetMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN2-HeadsetMic.conf
@@ -2,6 +2,7 @@ SectionDevice."HeadsetMic-IN2" {
        Comment "Headset Microphone on IN2"
 
        ConflictingDevice [
+               "DigitalMic"
                "InternalMic-IN1"
                "InternalMic-IN2"
                "InternalMic-IN12"

diff --git a/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf
index bbb713c..c9c11c2 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf
@@ -2,6 +2,7 @@ SectionDevice."InternalMic-IN2" {
        Comment "Internal Microphone on IN2"
 
        ConflictingDevice [
+               "DigitalMic"
                "InternalMic-IN1"
                "InternalMic-IN12"
                "HeadsetMic-IN2"

diff --git a/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf b/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf
index 48f3e46..66af6b9 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf
@@ -2,6 +2,7 @@ SectionDevice."HeadsetMic-IN3" {
        Comment "Headset Microphone on IN3"
 
        ConflictingDevice [
+               "DigitalMic"
                "InternalMic-IN1"
                "InternalMic-IN2"
                "InternalMic-IN12"

diff --git a/src/conf/ucm/codecs/rt5651/Makefile.am b/src/conf/ucm/codecs/rt5651/Makefile.am
index 889b4fd..29b6843 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/Makefile.am
+++ b/src/conf/ucm/codecs/rt5651/Makefile.am
@@ -1,6 +1,7 @@
 alsaconfigdir = @ALSA_CONFIG_DIR@
 ucmdir = $(alsaconfigdir)/ucm/codecs/rt5651
-ucm_DATA = EnableSeq.conf HeadPhones.conf HeadPhones-swapped.conf \
+ucm_DATA = DigitalMic.conf EnableSeq.conf \
+          HeadPhones.conf HeadPhones-swapped.conf \
           IN1-InternalMic.conf IN2-InternalMic.conf IN12-InternalMic.conf \
           IN2-HeadsetMic.conf IN3-HeadsetMic.conf Speaker.conf MonoSpeaker.conf
 EXTRA_DIST = $(ucm_DATA)