[alsa-ucm-conf,7/7] codecs/msm8916-wcd: Add ConflictingDevice for capture devices
diff mbox series

Message ID 20200114112110.51983-8-stephan@gerhold.net
State New
Headers show
Series
  • DB410c/msm8916-wcd UCM fixes/additions
Related show

Commit Message

Stephan Gerhold Jan. 14, 2020, 11:21 a.m. UTC
At the moment, all capture devices are configured to go through DEC1,
so there is no way to use more than one of the microphones at a time.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
 ucm2/codecs/msm8916-wcd/DigitalMic.conf   | 6 ++++++
 ucm2/codecs/msm8916-wcd/HeadsetMic.conf   | 6 ++++++
 ucm2/codecs/msm8916-wcd/PrimaryMic.conf   | 6 ++++++
 ucm2/codecs/msm8916-wcd/SecondaryMic.conf | 6 ++++++
 4 files changed, 24 insertions(+)

Patch
diff mbox series

diff --git a/ucm2/codecs/msm8916-wcd/DigitalMic.conf b/ucm2/codecs/msm8916-wcd/DigitalMic.conf
index 35dfb1b..3446506 100644
--- a/ucm2/codecs/msm8916-wcd/DigitalMic.conf
+++ b/ucm2/codecs/msm8916-wcd/DigitalMic.conf
@@ -1,6 +1,12 @@ 
 SectionDevice."DigitalMic" {
 	Comment "Digital Microphone"
 
+	ConflictingDevice [
+		"PrimaryMic"
+		"SecondaryMic"
+		"HeadsetMic"
+	]
+
 	EnableSequence [
 		cset "name='DEC1 MUX' DMIC1"
 		cset "name='CIC1 MUX' DMIC"
diff --git a/ucm2/codecs/msm8916-wcd/HeadsetMic.conf b/ucm2/codecs/msm8916-wcd/HeadsetMic.conf
index 538d895..2a96e49 100644
--- a/ucm2/codecs/msm8916-wcd/HeadsetMic.conf
+++ b/ucm2/codecs/msm8916-wcd/HeadsetMic.conf
@@ -1,6 +1,12 @@ 
 SectionDevice."HeadsetMic" {
 	Comment "Headset Microphone"
 
+	ConflictingDevice [
+		"PrimaryMic"
+		"SecondaryMic"
+		"DigitalMic"
+	]
+
 	EnableSequence [
 		cset "name='DEC1 MUX' ADC2"
 		cset "name='CIC1 MUX' AMIC"
diff --git a/ucm2/codecs/msm8916-wcd/PrimaryMic.conf b/ucm2/codecs/msm8916-wcd/PrimaryMic.conf
index 6998458..9d549ef 100644
--- a/ucm2/codecs/msm8916-wcd/PrimaryMic.conf
+++ b/ucm2/codecs/msm8916-wcd/PrimaryMic.conf
@@ -1,6 +1,12 @@ 
 SectionDevice."PrimaryMic" {
 	Comment "Primary Microphone"
 
+	ConflictingDevice [
+		"SecondaryMic"
+		"HeadsetMic"
+		"DigitalMic"
+	]
+
 	EnableSequence [
 		cset "name='DEC1 MUX' ADC1"
 		cset "name='CIC1 MUX' AMIC"
diff --git a/ucm2/codecs/msm8916-wcd/SecondaryMic.conf b/ucm2/codecs/msm8916-wcd/SecondaryMic.conf
index fdc5df8..d81324c 100644
--- a/ucm2/codecs/msm8916-wcd/SecondaryMic.conf
+++ b/ucm2/codecs/msm8916-wcd/SecondaryMic.conf
@@ -1,6 +1,12 @@ 
 SectionDevice."SecondaryMic" {
 	Comment "Secondary Microphone"
 
+	ConflictingDevice [
+		"PrimaryMic"
+		"HeadsetMic"
+		"DigitalMic"
+	]
+
 	EnableSequence [
 		cset "name='DEC1 MUX' ADC2"
 		cset "name='CIC1 MUX' AMIC"