sof-hda-dsp: add support for mono microphone (HeadphoneMic = stereo, HeadsetMic ...

Idea-by: Jaska Uimonen <jaska.uimonen@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/sof-hda-dsp/HDA-Capture-value.conf b/ucm2/sof-hda-dsp/HDA-Capture-value.conf
new file mode 100644 (file)
index 0000000..b3e90aa
--- /dev/null
+++ b/ucm2/sof-hda-dsp/HDA-Capture-value.conf
@@ -0,0 +1,5 @@
+CapturePCM "hw:${CardId},0"
+CaptureMixerElem "Capture"
+CaptureVolume "Capture Volume"
+CaptureSwitch "Capture Switch"
+CaptureChannels "2"

diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf
index 06bc2f9994024f6d388a1f8c432afb0fd8cc040c..97adbe545b2b73c5e99d3651660ea9593446fb91 100644 (file)
--- a/ucm2/sof-hda-dsp/HiFi.conf
+++ b/ucm2/sof-hda-dsp/HiFi.conf
@@ -80,16 +80,51 @@ SectionDevice."Speaker" {
        }
 }
 
-SectionDevice."HeadsetMic" {
-       Comment "Headset Microphone"
+If.monomic {
+       Condition {
+               Type ControlExists
+               Control "name='Input Source'"
+       }
+       True {
+               SectionDevice."HeadphoneMic" {
+                       Comment "Headphone Stereo Microphone"
 
-       Value {
-               CapturePCM "hw:${CardId},0"
-               CaptureMixerElem "Capture"
-               CaptureVolume "Capture Volume"
-               CaptureSwitch "Capture Switch"
-               CaptureChannels "2"
-               JackControl "Mic Jack"
+                       ConflictingDevice [
+                               "HeadsetMic"
+                       ]
+
+                       EnableSequence [
+                               cset "name='Input Source' Headphone Mic"
+                       ]
+
+                       Value {
+                               <sof-hda-dsp/HDA-Capture-value.conf>
+                               JackControl "Headphone Mic Jack"
+                       }
+               }
+
+               SectionDevice."HeadsetMic" {
+                       Comment "Headset Mono Microphone"
+
+                       EnableSequence [
+                               cset "name='Input Source' Headset Mic"
+                       ]
+
+                       Value {
+                               <sof-hda-dsp/HDA-Capture-value.conf>
+                               JackControl "Headphone Mic Jack"
+                       }
+               }
+       }
+       False {
+               SectionDevice."HeadphoneMic" {
+                       Comment "Headphone Stereo Microphone"
+
+                       Value {
+                               <sof-hda-dsp/HDA-Capture-value.conf>
+                               JackControl "Mic Jack"
+                       }
+               }
        }
 }