codecs/rt5640: Make headset optional

Nexus 7 has a 3-pin 3.5mm headphones jack, it doesn't support headset
microphone, and thus, it doesn't have headset microphone jack. Make
headset device optional.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/bytcr-rt5640/HiFi-Components.conf b/ucm2/bytcr-rt5640/HiFi-Components.conf
index 227a9f5ee15e3d8daee9fd05584198af310e510f..b3ab9a0b1b0d45ae7de3a62e85b42c8c773406d4 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi-Components.conf
+++ b/ucm2/bytcr-rt5640/HiFi-Components.conf
@@ -1,4 +1,5 @@
 Define.HaveSpeaker ""
+Define.HaveHeadsetMic ""
 Define.HaveInternalMic ""
 
 If.spk {
@@ -129,6 +130,7 @@ If.in3 {
 If.hsmic {
        Condition { Type String Empty "" }
        True.Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
+       Define.HaveHeadsetMic "yes"
 
        SectionDevice."Headset" {
                EnableSequence [

diff --git a/ucm2/bytcr-rt5640/HiFi-LongName.conf b/ucm2/bytcr-rt5640/HiFi-LongName.conf
index 7b532848b80b26b65e09941303b030b2777cc837..090010a674728d052822ba96ef194da6f772fa1a 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi-LongName.conf
+++ b/ucm2/bytcr-rt5640/HiFi-LongName.conf
@@ -1,4 +1,5 @@
 Define.HaveSpeaker ""
+Define.HaveHeadsetMic ""
 Define.HaveInternalMic ""
 
 If.spk {
@@ -129,6 +130,7 @@ If.in3 {
 If.hsmic {
        Condition { Type String Empty "" }
        True.Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
+       Define.HaveHeadsetMic "yes"
 
        SectionDevice."Headset" {
                EnableSequence [

diff --git a/ucm2/codecs/rt5640/DigitalMics.conf b/ucm2/codecs/rt5640/DigitalMics.conf
index 7566f5b313deb9406349ce9ec47d0f16db989183..79da8a386ba187deb5145dc6bf599d36f3e6d495 100644 (file)
--- a/ucm2/codecs/rt5640/DigitalMics.conf
+++ b/ucm2/codecs/rt5640/DigitalMics.conf
@@ -1,9 +1,17 @@
 SectionDevice."Mic" {
        Comment "Internal Digital Microphones"
 
-       ConflictingDevice [
-               "Headset"
-       ]
+       If.have-headset {
+               Condition {
+                       Type String
+                       Empty "${var:HaveHeadsetMic}"
+               }
+               False {
+                       ConflictingDevice [
+                               "Headset"
+                       ]
+               }
+       }
 
        EnableSequence [
                cset "name='Mono ADC MIXL ADC2 Switch' on"

diff --git a/ucm2/codecs/rt5640/IN1-InternalMic.conf b/ucm2/codecs/rt5640/IN1-InternalMic.conf
index 18715e5c6eeaf5df07e18c7d98047e0a7c8f4aa1..146d7ec5ea34128bd68fea6edfbb7d09a5044d2e 100644 (file)
--- a/ucm2/codecs/rt5640/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN1-InternalMic.conf
@@ -1,9 +1,17 @@
 SectionDevice."Mic" {
        Comment "Internal Microphone on IN1"
 
-       ConflictingDevice [
-               "Headset"
-       ]
+       If.have-headset {
+               Condition {
+                       Type String
+                       Empty "${var:HaveHeadsetMic}"
+               }
+               False {
+                       ConflictingDevice [
+                               "Headset"
+                       ]
+               }
+       }
 
        EnableSequence [
                cset "name='RECMIXL BST1 Switch' on"

diff --git a/ucm2/codecs/rt5640/IN3-InternalMic.conf b/ucm2/codecs/rt5640/IN3-InternalMic.conf
index c90b6e43a21dbe2c0e608e46d223950b81d0f0f7..c896082cb6118e0dd444c81c9a5a86370f4c2960 100644 (file)
--- a/ucm2/codecs/rt5640/IN3-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN3-InternalMic.conf
@@ -1,9 +1,17 @@
 SectionDevice."Mic" {
        Comment "Internal Microphone on IN3"
 
-       ConflictingDevice [
-               "Headset"
-       ]
+       If.have-headset {
+               Condition {
+                       Type String
+                       Empty "${var:HaveHeadsetMic}"
+               }
+               False {
+                       ConflictingDevice [
+                               "Headset"
+                       ]
+               }
+       }
 
        EnableSequence [
                cset "name='RECMIXL BST3 Switch' on"