codecs/rt5640: Move out BayTrail-specific pin switches

The UCM of RT5640 codec toggles switches that exists only in a case of
the Intel BayTrail ASoC machine driver, RT5640 codec driver doesn't have
them. Move these switches to the BayTrail UCM in order to make generic UCM
rules reusable by other SoCs.

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 19997178a9346085c5aeaa3fda6f1cd314fd0cbe..227a9f5ee15e3d8daee9fd05584198af310e510f 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi-Components.conf
+++ b/ucm2/bytcr-rt5640/HiFi-Components.conf
@@ -10,6 +10,16 @@ If.spk {
        True {
                Include.spk.File "/codecs/rt5640/Speaker.conf"
                Define.HaveSpeaker "yes"
+
+               SectionDevice."Speaker" {
+                       EnableSequence [
+                               cset "name='Speaker Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Speaker Switch' off"
+                       ]
+               }
        }
 }
 
@@ -22,12 +32,32 @@ If.mono {
        True {
                Include.mspk.File "/codecs/rt5640/MonoSpeaker.conf"
                Define.HaveSpeaker "yes"
+
+               SectionDevice."Speaker" {
+                       EnableSequence [
+                               cset "name='Speaker Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Speaker Switch' off"
+                       ]
+               }
        }
 }
 
 If.hp {
        Condition { Type String Empty "" }
        True.Include.hs.File "/codecs/rt5640/HeadPhones.conf"
+
+       SectionDevice."Headphones" {
+               EnableSequence [
+                       cset "name='Headphone Switch' on"
+               ]
+
+               DisableSequence [
+                       cset "name='Headphone Switch' off"
+               ]
+       }
 }
 
 If.dmic1 {
@@ -39,6 +69,16 @@ If.dmic1 {
        True {
                Include.dmic.File "/codecs/rt5640/DigitalMics.conf"
                Define.HaveInternalMic "yes"
+
+               SectionDevice."Mic" {
+                       EnableSequence [
+                               cset "name='Internal Mic Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Internal Mic Switch' off"
+                       ]
+               }
        }
 }
 
@@ -51,6 +91,16 @@ If.in1 {
        True {
                Include.mic1.File "/codecs/rt5640/IN1-InternalMic.conf"
                Define.HaveInternalMic "yes"
+
+               SectionDevice."Mic" {
+                       EnableSequence [
+                               cset "name='Internal Mic Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Internal Mic Switch' off"
+                       ]
+               }
        }
 }
 
@@ -63,10 +113,30 @@ If.in3 {
        True {
                Include.mic3.File "/codecs/rt5640/IN3-InternalMic.conf"
                Define.HaveInternalMic "yes"
+
+               SectionDevice."Mic" {
+                       EnableSequence [
+                               cset "name='Internal Mic Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Internal Mic Switch' off"
+                       ]
+               }
        }
 }
 
 If.hsmic {
        Condition { Type String Empty "" }
        True.Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
+
+       SectionDevice."Headset" {
+               EnableSequence [
+                       cset "name='Headset Mic Switch' on"
+               ]
+
+               DisableSequence [
+                       cset "name='Headset Mic Switch' off"
+               ]
+       }
 }

diff --git a/ucm2/bytcr-rt5640/HiFi-LongName.conf b/ucm2/bytcr-rt5640/HiFi-LongName.conf
index 34acef8142f0b7f42f9eeffbabdb99225440f0d4..7b532848b80b26b65e09941303b030b2777cc837 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi-LongName.conf
+++ b/ucm2/bytcr-rt5640/HiFi-LongName.conf
@@ -10,6 +10,16 @@ If.spk {
        True {
                Include.spk.File "/codecs/rt5640/Speaker.conf"
                Define.HaveSpeaker "yes"
+
+               SectionDevice."Speaker" {
+                       EnableSequence [
+                               cset "name='Speaker Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Speaker Switch' off"
+                       ]
+               }
        }
 }
 
@@ -22,12 +32,32 @@ If.mono {
        True {
                Include.mspk.File "/codecs/rt5640/MonoSpeaker.conf"
                Define.HaveSpeaker "yes"
+
+               SectionDevice."Speaker" {
+                       EnableSequence [
+                               cset "name='Speaker Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Speaker Switch' off"
+                       ]
+               }
        }
 }
 
 If.hp {
        Condition { Type String Empty "" }
        True.Include.hs.File "/codecs/rt5640/HeadPhones.conf"
+
+       SectionDevice."Headphones" {
+               EnableSequence [
+                       cset "name='Headphone Switch' on"
+               ]
+
+               DisableSequence [
+                       cset "name='Headphone Switch' off"
+               ]
+       }
 }
 
 If.dmic1 {
@@ -39,6 +69,16 @@ If.dmic1 {
        True {
                Include.dmic.File "/codecs/rt5640/DigitalMics.conf"
                Define.HaveInternalMic "yes"
+
+               SectionDevice."Mic" {
+                       EnableSequence [
+                               cset "name='Internal Mic Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Internal Mic Switch' off"
+                       ]
+               }
        }
 }
 
@@ -51,6 +91,16 @@ If.in1 {
        True {
                Include.mic1.File "/codecs/rt5640/IN1-InternalMic.conf"
                Define.HaveInternalMic "yes"
+
+               SectionDevice."Mic" {
+                       EnableSequence [
+                               cset "name='Internal Mic Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Internal Mic Switch' off"
+                       ]
+               }
        }
 }
 
@@ -63,10 +113,30 @@ If.in3 {
        True {
                Include.mic3.File "/codecs/rt5640/IN3-InternalMic.conf"
                Define.HaveInternalMic "yes"
+
+               SectionDevice."Mic" {
+                       EnableSequence [
+                               cset "name='Internal Mic Switch' on"
+                       ]
+
+                       DisableSequence [
+                               cset "name='Internal Mic Switch' off"
+                       ]
+               }
        }
 }
 
 If.hsmic {
        Condition { Type String Empty "" }
        True.Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
+
+       SectionDevice."Headset" {
+               EnableSequence [
+                       cset "name='Headset Mic Switch' on"
+               ]
+
+               DisableSequence [
+                       cset "name='Headset Mic Switch' off"
+               ]
+       }
 }

diff --git a/ucm2/bytcr-rt5640/HiFi.conf b/ucm2/bytcr-rt5640/HiFi.conf
index 7d504d1805fbe1505198039bd9a952509ff7bc47..d0a783a15969fa2c108f7ef37590fc0fa303d1d6 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi.conf
+++ b/ucm2/bytcr-rt5640/HiFi.conf
@@ -24,6 +24,13 @@ If.DefineAif2 {
 SectionVerb {
        Include.e.File "/codecs/rt5640/EnableSeq.conf"
 
+       EnableSequence [
+               cset "name='Speaker Switch' off"
+               cset "name='Headphone Switch' off"
+               cset "name='Headset Mic Switch' off"
+               cset "name='Internal Mic Switch' off"
+       ]
+
        If.Controls {
                Condition {
                        Type ControlExists

diff --git a/ucm2/codecs/rt5640/DigitalMics.conf b/ucm2/codecs/rt5640/DigitalMics.conf
index 032d95477c33e9e8106ce6776a323db4d861fc5c..7566f5b313deb9406349ce9ec47d0f16db989183 100644 (file)
--- a/ucm2/codecs/rt5640/DigitalMics.conf
+++ b/ucm2/codecs/rt5640/DigitalMics.conf
@@ -10,7 +10,6 @@ SectionDevice."Mic" {
                cset "name='Mono ADC MIXR ADC2 Switch' on"
                cset "name='Stereo ADC MIXL ADC2 Switch' on"
                cset "name='Stereo ADC MIXR ADC2 Switch' on"
-               cset "name='Internal Mic Switch' on"
 
        ]
 
@@ -19,7 +18,6 @@ SectionDevice."Mic" {
                cset "name='Mono ADC MIXR ADC2 Switch' off"
                cset "name='Stereo ADC MIXL ADC2 Switch' off"
                cset "name='Stereo ADC MIXR ADC2 Switch' off"
-               cset "name='Internal Mic Switch' off"
 
        ]
 

diff --git a/ucm2/codecs/rt5640/EnableSeq.conf b/ucm2/codecs/rt5640/EnableSeq.conf
index 49703aec8c40a458cc727ca555b2e4f51eea945a..e177d9075d11fb902b460cbfb343570c871faab1 100644 (file)
--- a/ucm2/codecs/rt5640/EnableSeq.conf
+++ b/ucm2/codecs/rt5640/EnableSeq.conf
@@ -71,9 +71,4 @@ EnableSequence [
        cset "name='Mono ADC MIXR ADC1 Switch' off"
        cset "name='Mono ADC MIXL ADC2 Switch' off"
        cset "name='Mono ADC MIXR ADC2 Switch' off"
-
-       cset "name='Speaker Switch' off"
-       cset "name='Headphone Switch' off"
-       cset "name='Internal Mic Switch' off"
-       cset "name='Headset Mic Switch' off"
 ]

diff --git a/ucm2/codecs/rt5640/HeadPhones.conf b/ucm2/codecs/rt5640/HeadPhones.conf
index 4fbe95d9cfd3ea157150963215a2cd76f6bceab1..3921e8d1368e3d3117335a557d229c646e0d8947 100644 (file)
--- a/ucm2/codecs/rt5640/HeadPhones.conf
+++ b/ucm2/codecs/rt5640/HeadPhones.conf
@@ -15,7 +15,6 @@ SectionDevice."Headphones" {
 
        EnableSequence [
                cset "name='HPO MIX HPVOL Switch'  on"
-               cset "name='Headphone Switch'  on"
                cset "name='HP Channel Switch' on"
                cset "name='HP L Playback Switch' on"
                cset "name='HP R Playback Switch' on"
@@ -24,7 +23,6 @@ SectionDevice."Headphones" {
        ]
 
        DisableSequence [
-               cset "name='Headphone Switch' off"
                cset "name='HP Channel Switch' off"
                cset "name='HP L Playback Switch' off"
                cset "name='HP R Playback Switch' off"

diff --git a/ucm2/codecs/rt5640/HeadsetMic.conf b/ucm2/codecs/rt5640/HeadsetMic.conf
index b49dad4998629be541a8d62136240fd5628a3f86..997aa2950309fb19f6a05b4c96e25932c9ba5d7e 100644 (file)
--- a/ucm2/codecs/rt5640/HeadsetMic.conf
+++ b/ucm2/codecs/rt5640/HeadsetMic.conf
@@ -14,8 +14,6 @@ SectionDevice."Headset" {
        }
 
        EnableSequence [
-               cset "name='Headset Mic Switch' on"
-
                cset "name='RECMIXL BST2 Switch' on"
                cset "name='RECMIXR BST2 Switch' on"
 
@@ -33,8 +31,6 @@ SectionDevice."Headset" {
 
                cset "name='RECMIXL BST2 Switch' off"
                cset "name='RECMIXR BST2 Switch' off"
-
-               cset "name='Headset Mic Switch' off"
        ]
 
        Value {

diff --git a/ucm2/codecs/rt5640/IN1-InternalMic.conf b/ucm2/codecs/rt5640/IN1-InternalMic.conf
index d670484b9bce0ce1a1d14db628944f4e1847fe28..18715e5c6eeaf5df07e18c7d98047e0a7c8f4aa1 100644 (file)
--- a/ucm2/codecs/rt5640/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN1-InternalMic.conf
@@ -6,8 +6,6 @@ SectionDevice."Mic" {
        ]
 
        EnableSequence [
-               cset "name='Internal Mic Switch' on"
-
                cset "name='RECMIXL BST1 Switch' on"
                cset "name='RECMIXR BST1 Switch' on"
 
@@ -25,8 +23,6 @@ SectionDevice."Mic" {
 
                cset "name='RECMIXL BST1 Switch' off"
                cset "name='RECMIXR BST1 Switch' off"
-
-               cset "name='Internal Mic Switch' off"
        ]
 
        Value {

diff --git a/ucm2/codecs/rt5640/IN3-InternalMic.conf b/ucm2/codecs/rt5640/IN3-InternalMic.conf
index 345db1e31eaaa3a9c9433ed4afb1630a4a3d65f3..c90b6e43a21dbe2c0e608e46d223950b81d0f0f7 100644 (file)
--- a/ucm2/codecs/rt5640/IN3-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN3-InternalMic.conf
@@ -6,8 +6,6 @@ SectionDevice."Mic" {
        ]
 
        EnableSequence [
-               cset "name='Internal Mic Switch' on"
-
                cset "name='RECMIXL BST3 Switch' on"
                cset "name='RECMIXR BST3 Switch' on"
 
@@ -25,8 +23,6 @@ SectionDevice."Mic" {
 
                cset "name='RECMIXL BST3 Switch' off"
                cset "name='RECMIXR BST3 Switch' off"
-
-               cset "name='Internal Mic Switch' off"
        ]
 
        Value {

diff --git a/ucm2/codecs/rt5640/MonoSpeaker.conf b/ucm2/codecs/rt5640/MonoSpeaker.conf
index addadddb16c271d357b5ab37c0c3af3c0c27f07d..a5cf8399a5a3bac5c8023e6d09db502e67be4496 100644 (file)
--- a/ucm2/codecs/rt5640/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5640/MonoSpeaker.conf
@@ -10,7 +10,6 @@ SectionDevice."Speaker" {
 # for mono speaker we apply left on right
 #              cset "name='SPOR MIX SPKVOL R Switch' on"
                cset "name='SPOL MIX SPKVOL R Switch' on"
-               cset "name='Speaker Switch' on"
                cset "name='Speaker Channel Switch' on"
                cset "name='Speaker L Playback Switch' on"
                cset "name='Speaker R Playback Switch' on"
@@ -19,7 +18,6 @@ SectionDevice."Speaker" {
        ]
 
        DisableSequence [
-               cset "name='Speaker Switch' off"
                cset "name='Speaker Channel Switch' off"
                cset "name='Speaker L Playback Switch' off"
                cset "name='Speaker R Playback Switch' off"

diff --git a/ucm2/codecs/rt5640/Speaker.conf b/ucm2/codecs/rt5640/Speaker.conf
index e7ff67380eb80b5f82e4e2f39baa3a0704564fc7..692a549201abb4fd26bbb6c6e42556d449422394 100644 (file)
--- a/ucm2/codecs/rt5640/Speaker.conf
+++ b/ucm2/codecs/rt5640/Speaker.conf
@@ -10,7 +10,6 @@ SectionDevice."Speaker" {
                cset "name='SPOR MIX SPKVOL R Switch' on"
                # undo MonoSpeaker mixing of right channel to left speaker
                cset "name='SPOL MIX SPKVOL R Switch' off"
-               cset "name='Speaker Switch' on"
                cset "name='Speaker Channel Switch' on"
                cset "name='Speaker L Playback Switch' on"
                cset "name='Speaker R Playback Switch' on"
@@ -19,7 +18,6 @@ SectionDevice."Speaker" {
        ]
 
        DisableSequence [
-               cset "name='Speaker Switch' off"
                cset "name='Speaker Channel Switch' off"
                cset "name='Speaker L Playback Switch' off"
                cset "name='Speaker R Playback Switch' off"