conf/ucm: bytcr-rt5651: Add support for mic input on various pins

Note this commit replaces the pre-existing "Handset Microphone" and
"Main Microphone" options, these come from the first commit of the
bytcr-rt5651 UCM profile and were based on wrong assumptions about the
input mappings. None of the existing devices has the Hand/Headset mic
on IN1 as these options assumed.

The rt5651 is used in various configurations with the Internal Mic(s)
hooked up to IN1, IN2, or to IN1 and IN2 and the Headset Mic hooked up
to IN3.

Add support for all these to the generic bytcr-rt5651 profile and name
them accotding to their input + functions.

A follow up commit will add specialized longname configs which
will only expose the inputs actually used on the board with that
longname.

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm/bytcr-rt5651/HiFi.conf b/ucm/bytcr-rt5651/HiFi.conf
index fd878f4a8ad2a3358ea05a6f167901439109548f..54c365d968a35fc2efb049499acc0e5396fb8f4f 100644 (file)
--- a/ucm/bytcr-rt5651/HiFi.conf
+++ b/ucm/bytcr-rt5651/HiFi.conf
@@ -85,51 +85,91 @@ SectionDevice."Speaker" {
        }
 }
 
-SectionDevice."Handset" {
-       Comment "Handset Microphone"
+SectionDevice."InternalMic-IN1" {
+       Comment "Internal Microphone on IN1"
 
        ConflictingDevice [
-               "Mainmic"
+               "InternalMic-IN2"
+               "InternalMic-IN12"
+               "HeadsetMic-IN3"
        ]
 
        EnableSequence [
                cdev "hw:bytcrrt5651"
-               exec "echo Handset Microphone enable sequence"
+               exec "echo Internal Mic IN1 Microphone enable sequence"
+               cset "name='Internal Mic Switch' on"
                cset "name='RECMIXL BST1 Switch' on"
                cset "name='RECMIXR BST1 Switch' on"
        ]
 
        DisableSequence [
                cdev "hw:bytcrrt5651"
-               exec "echo Handset Microphone disable sequence"
+               exec "echo Internal Mic IN1 Microphone disable sequence"
+               cset "name='Internal Mic Switch' off"
                cset "name='RECMIXL BST1 Switch' off"
                cset "name='RECMIXR BST1 Switch' off"
        ]
 
        Value {
                CaptureChannels "2"
-               JackControl "Headset Mic Jack"
        }
 }
 
+SectionDevice."InternalMic-IN2" {
+       Comment "Internal Microphone on IN2"
+
+       ConflictingDevice [
+               "InternalMic-IN1"
+               "InternalMic-IN12"
+               "HeadsetMic-IN3"
+       ]
+
+       EnableSequence [
+               cdev "hw:bytcrrt5651"
+               exec "echo Internal Mic IN2 Microphone enable sequence"
+               cset "name='Internal Mic Switch' on"
+               cset "name='RECMIXL BST2 Switch' on"
+               cset "name='RECMIXR BST2 Switch' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:bytcrrt5651"
+               exec "echo Internal Mic IN2 Microphone disable sequence"
+               cset "name='Internal Mic Switch' off"
+               cset "name='RECMIXL BST2 Switch' off"
+               cset "name='RECMIXR BST2 Switch' off"
+       ]
 
-SectionDevice."Mainmic" {
-       Comment "Main Microphone"
+       Value {
+               CaptureChannels "2"
+       }
+}
+
+SectionDevice."InternalMic-IN12" {
+       Comment "Internal Microphones on IN1 and IN2"
 
        ConflictingDevice [
-               "Handset"
+               "InternalMic-IN1"
+               "InternalMic-IN2"
+               "HeadsetMic-IN3"
        ]
 
        EnableSequence [
                cdev "hw:bytcrrt5651"
-               exec "echo Main Microphone enable sequence"
+               exec "echo Internal Mic IN12 Microphone enable sequence"
+               cset "name='Internal Mic Switch' on"
+               cset "name='RECMIXL BST1 Switch' on"
+               cset "name='RECMIXR BST1 Switch' on"
                cset "name='RECMIXL BST2 Switch' on"
                cset "name='RECMIXR BST2 Switch' on"
        ]
 
        DisableSequence [
                cdev "hw:bytcrrt5651"
-               exec "echo Main Microphone disable sequence"
+               exec "echo Internal Mic IN12 Microphone disable sequence"
+               cset "name='Internal Mic Switch' off"
+               cset "name='RECMIXL BST1 Switch' off"
+               cset "name='RECMIXR BST1 Switch' off"
                cset "name='RECMIXL BST2 Switch' off"
                cset "name='RECMIXR BST2 Switch' off"
        ]
@@ -138,3 +178,34 @@ SectionDevice."Mainmic" {
                CaptureChannels "2"
        }
 }
+
+SectionDevice."HeadsetMic-IN3" {
+       Comment "Headset Microphone"
+
+       ConflictingDevice [
+               "InternalMic-IN1"
+               "InternalMic-IN2"
+               "InternalMic-IN12"
+       ]
+
+       EnableSequence [
+               cdev "hw:bytcrrt5651"
+               exec "echo HeadsetMic-IN3 Microphone enable sequence"
+               cset "name='Headset Mic Switch' on"
+               cset "name='RECMIXL BST3 Switch' on"
+               cset "name='RECMIXR BST3 Switch' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:bytcrrt5651"
+               exec "echo HeadsetMic-IN3 Microphone disable sequence"
+               cset "name='Headset Mic Switch' off"
+               cset "name='RECMIXL BST3 Switch' off"
+               cset "name='RECMIXR BST3 Switch' off"
+       ]
+
+       Value {
+               CaptureChannels "2"
+               JackControl "Headset Mic Jack"
+       }
+}