bytcr-rt5640: Add support for devices using the DMIC2 input for their internal mic(s)

Add support for devices using the DMIC2 input for their internal mic(s),
this has been tested on a HP Elitepad 1000 G2.

Cc: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf b/ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf
index 81560068b7e68786c5836587d32d347a2688b86a..0cc5f4c2212b14bfb5049f95d0d6a6fd071ee9fe 100644 (file)
--- a/ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf
+++ b/ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf
@@ -3,7 +3,8 @@
 Define.HaveAif "1"
 Define.HaveSpeaker "2"
 Define.HaveHeadsetMic ""
-Define.HaveInternalMic "dmic1"
+Define.HaveInternalMic "dmic"
+Define.StereoADC2Mux "DMIC1"
 
 Include.hp.File "/codecs/rt5640/HeadPhones.conf"
 Include.mspk.File "/codecs/rt5640/Speaker.conf"

diff --git a/ucm2/bytcr-rt5640/HiFi-Components.conf b/ucm2/bytcr-rt5640/HiFi-Components.conf
index 729b2b60af3eb3ee1b2ad0570569f28dbc58d6ea..39c7f36d3937b994e693ee40da13c73f17a0e390 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi-Components.conf
+++ b/ucm2/bytcr-rt5640/HiFi-Components.conf
@@ -22,7 +22,22 @@ If.dmic1 {
                Haystack "${CardComponents}"
                Needle "cfg-mic:dmic1"
        }
-       True.Define.HaveInternalMic "dmic1"
+       True {
+               Define.HaveInternalMic "dmic"
+               Define.StereoADC2Mux "DMIC1"
+       }
+}
+
+If.dmic2 {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "cfg-mic:dmic2"
+       }
+       True {
+               Define.HaveInternalMic "dmic"
+               Define.StereoADC2Mux "DMIC2"
+       }
 }
 
 If.in1 {

diff --git a/ucm2/bytcr-rt5640/HiFi-LongName.conf b/ucm2/bytcr-rt5640/HiFi-LongName.conf
index 7af2d4a4ca438b9b7f764b158ea886a185274ee3..b2fb471d982f71a5e023476a57b7e3c295c05e33 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi-LongName.conf
+++ b/ucm2/bytcr-rt5640/HiFi-LongName.conf
@@ -22,7 +22,10 @@ If.dmic1 {
                Haystack "${CardLongName}"
                Needle "-dmic1-mic"
        }
-       True.Define.HaveInternalMic "dmic1"
+       True {
+               Define.HaveInternalMic "dmic"
+               Define.StereoADC2Mux "DMIC1"
+       }
 }
 
 If.in1 {

diff --git a/ucm2/bytcr-rt5640/HiFi.conf b/ucm2/bytcr-rt5640/HiFi.conf
index 08127e024d180e0a8d1df5d78b9330803aeea6c6..604e7d9e204fcbe1e9b940896e8dae70453b7f7f 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi.conf
+++ b/ucm2/bytcr-rt5640/HiFi.conf
@@ -4,6 +4,7 @@ Define.HaveAif ""
 Define.HaveSpeaker ""
 Define.HaveInternalMic ""
 Define.HaveHeadsetMic "yes"
+Define.StereoADC2Mux "DMIC1"
 
 If.DefineAif1 {
        Condition {
@@ -115,11 +116,11 @@ If.hp {
        }
 }
 
-If.dmic1 {
+If.dmic {
        Condition {
                Type String
                Haystack "${var:HaveInternalMic}"
-               Needle "dmic1"
+               Needle "dmic"
        }
        True {
                Include.dmic.File "/codecs/rt5640/DigitalMics.conf"

diff --git a/ucm2/codecs/rt5640/DigitalMics.conf b/ucm2/codecs/rt5640/DigitalMics.conf
index b4d01aede0d1a1f57644b21db14b72d9d5f84128..188df0a26b70c7287f2f88d0b77f6d78b293a06f 100644 (file)
--- a/ucm2/codecs/rt5640/DigitalMics.conf
+++ b/ucm2/codecs/rt5640/DigitalMics.conf
@@ -14,6 +14,7 @@ SectionDevice."Mic" {
        }
 
        EnableSequence [
+               cset "name='Stereo ADC2 Mux' ${var:StereoADC2Mux}"
                cset "name='Mono ADC MIXL ADC2 Switch' on"
                cset "name='Mono ADC MIXR ADC2 Switch' on"
                cset "name='Stereo ADC MIXL ADC2 Switch' on"

diff --git a/ucm2/codecs/rt5640/EnableSeq.conf b/ucm2/codecs/rt5640/EnableSeq.conf
index 4e9a6c0fa2a17dbce31698822df6781ab8197e30..d9d536c4be3726d1ebe8d29d05c0c26886da7b08 100644 (file)
--- a/ucm2/codecs/rt5640/EnableSeq.conf
+++ b/ucm2/codecs/rt5640/EnableSeq.conf
@@ -30,7 +30,6 @@ EnableSequence [
 
        # Input Configuration
        cset "name='Stereo ADC1 Mux' ADC"
-       cset "name='Stereo ADC2 Mux' DMIC1"
        cset "name='ADC Capture Switch' on"
 
        cset "name='Mono ADC L1 Mux' ADCL"