bytcr-rt5651: cleanups and corrections

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/bytcr-rt5651/HiFi-Components.conf b/ucm2/bytcr-rt5651/HiFi-Components.conf
index 235838e553a219597ea48599f4cb8d0eeda5c499..53ebcbe252c846318f666f83b0cf76f9bb8527ff 100644 (file)
--- a/ucm2/bytcr-rt5651/HiFi-Components.conf
+++ b/ucm2/bytcr-rt5651/HiFi-Components.conf
@@ -42,6 +42,11 @@ If.dmic1 {
        }
        True {
                <codecs/rt5651/DigitalMic.conf>
+               <codecs/rt5651/IN2-HeadsetMic.conf>
+               SectionDevice."Mic".ConflictingDevice.0 "Headset"
+       }
+       False {
+               <codecs/rt5651/IN3-HeadsetMic.conf>
        }
 }
 
@@ -77,5 +82,3 @@ If.in12 {
                <codecs/rt5651/IN12-InternalMic.conf>
        }
 }
-
-<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm2/bytcr-rt5651/HiFi-LongName.conf b/ucm2/bytcr-rt5651/HiFi-LongName.conf
index 58eb722d485b874f50a80cff7a1c87c47f3b7c49..e6dd908136811b73c739668c54b64af8bb0a5615 100644 (file)
--- a/ucm2/bytcr-rt5651/HiFi-LongName.conf
+++ b/ucm2/bytcr-rt5651/HiFi-LongName.conf
@@ -42,6 +42,10 @@ If.dmic1 {
        }
        True {
                <codecs/rt5651/DigitalMic.conf>
+               <codecs/rt5651/IN2-HeadsetMic.conf>
+       }
+       False {
+               <codecs/rt5651/IN3-HeadsetMic.conf>
        }
 }
 
@@ -77,5 +81,3 @@ If.in12 {
                <codecs/rt5651/IN12-InternalMic.conf>
        }
 }
-
-<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm2/bytcr-rt5651/HiFi.conf b/ucm2/bytcr-rt5651/HiFi.conf
index 1f031f25e87299685f961efcde8cd9160b236240..8a9a402da328c603b03f128bf373ac9516ade737 100644 (file)
--- a/ucm2/bytcr-rt5651/HiFi.conf
+++ b/ucm2/bytcr-rt5651/HiFi.conf
@@ -10,11 +10,6 @@ SectionVerb {
        DisableSequence [
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
-
-       Value {
-               PlaybackPCM "hw:${CardId}"
-               CapturePCM "hw:${CardId}"
-       }
 }
 
 If.0 {

diff --git a/ucm2/codecs/rt5651/DigitalMic.conf b/ucm2/codecs/rt5651/DigitalMic.conf
index 7a0c4d4e59e9c599b0b479de92bb927903b52614..fa1de4c2afb7161a615df6fdbf1b5ff57f3cc112 100644 (file)
--- a/ucm2/codecs/rt5651/DigitalMic.conf
+++ b/ucm2/codecs/rt5651/DigitalMic.conf
@@ -1,14 +1,6 @@
-SectionDevice."DigitalMic" {
+SectionDevice."Mic" {
        Comment "Internal Digital Microphone"
 
-       ConflictingDevice [
-               "InternalMic-IN1"
-               "InternalMic-IN2"
-               "InternalMic-IN12"
-               "HeadsetMic-IN2"
-               "HeadsetMic-IN3"
-       ]
-
        EnableSequence [
                cset "name='Stereo1 ADC MIXL ADC2 Switch' on"
                cset "name='Stereo1 ADC MIXR ADC2 Switch' on"
@@ -22,6 +14,8 @@ SectionDevice."DigitalMic" {
        ]
 
        Value {
+               CapturePriority 100
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/HeadPhones-swapped.conf b/ucm2/codecs/rt5651/HeadPhones-swapped.conf
index f5260a3734fb4bd66f2fe0d41724981f4ffb8c03..7e91aa271345435417f7d4694175dead85c5a451 100644 (file)
--- a/ucm2/codecs/rt5651/HeadPhones-swapped.conf
+++ b/ucm2/codecs/rt5651/HeadPhones-swapped.conf
@@ -3,7 +3,6 @@ SectionDevice."Headphones" {
 
        ConflictingDevice [
                "Speaker"
-               "MonoSpeaker"
        ]
 
        EnableSequence [
@@ -33,7 +32,9 @@ SectionDevice."Headphones" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 200
+               PlaybackChannels 2
+               PlaybackPCM "hw:${CardId}"
                JackControl "Headphone Jack"
        }
 }

diff --git a/ucm2/codecs/rt5651/HeadPhones.conf b/ucm2/codecs/rt5651/HeadPhones.conf
index 0a87b32f5be5ec4a173d1dc0e26e95930db5ef05..18a41082b78f9315f870485b3de119be5d48ea31 100644 (file)
--- a/ucm2/codecs/rt5651/HeadPhones.conf
+++ b/ucm2/codecs/rt5651/HeadPhones.conf
@@ -3,7 +3,6 @@ SectionDevice."Headphones" {
 
        ConflictingDevice [
                "Speaker"
-               "MonoSpeaker"
        ]
 
        EnableSequence [
@@ -24,7 +23,9 @@ SectionDevice."Headphones" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 }

diff --git a/ucm2/codecs/rt5651/IN1-InternalMic.conf b/ucm2/codecs/rt5651/IN1-InternalMic.conf
index 01b786e17f5d7908e417443293b8dd8044bba6cf..13c7cb6137af0d5de93c65ad115c46a256040dee 100644 (file)
--- a/ucm2/codecs/rt5651/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5651/IN1-InternalMic.conf
@@ -1,14 +1,6 @@
-SectionDevice."InternalMic-IN1" {
+SectionDevice."Mic" {
        Comment "Internal Microphone on IN1"
 
-       ConflictingDevice [
-               "DigitalMic"
-               "InternalMic-IN2"
-               "InternalMic-IN12"
-               "HeadsetMic-IN2"
-               "HeadsetMic-IN3"
-       ]
-
        EnableSequence [
                cset "name='Internal Mic Switch' on"
                cset "name='RECMIXL BST1 Switch' on"
@@ -26,6 +18,8 @@ SectionDevice."InternalMic-IN1" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 100
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/IN12-InternalMic.conf b/ucm2/codecs/rt5651/IN12-InternalMic.conf
index 44cc53ab4c73991824a71ecc9db347379a0e9932..e0175418b0591fe09ddb6e2990858c60241024f5 100644 (file)
--- a/ucm2/codecs/rt5651/IN12-InternalMic.conf
+++ b/ucm2/codecs/rt5651/IN12-InternalMic.conf
@@ -1,14 +1,6 @@
-SectionDevice."InternalMic-IN12" {
+SectionDevice."Mic" {
        Comment "Internal Microphones on IN1 and IN2"
 
-       ConflictingDevice [
-               "DigitalMic"
-               "InternalMic-IN1"
-               "InternalMic-IN2"
-               "HeadsetMic-IN2"
-               "HeadsetMic-IN3"
-       ]
-
        EnableSequence [
                cset "name='Internal Mic Switch' on"
                cset "name='RECMIXL BST1 Switch' on"
@@ -30,6 +22,8 @@ SectionDevice."InternalMic-IN12" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 100
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/IN2-HeadsetMic.conf b/ucm2/codecs/rt5651/IN2-HeadsetMic.conf
index 177f70b0c26996f998b24781d7400574f19324e1..5b514390a17839e034c72c1294839693c12b3fca 100644 (file)
--- a/ucm2/codecs/rt5651/IN2-HeadsetMic.conf
+++ b/ucm2/codecs/rt5651/IN2-HeadsetMic.conf
@@ -1,12 +1,8 @@
-SectionDevice."HeadsetMic-IN2" {
+SectionDevice."Headset" {
        Comment "Headset Microphone on IN2"
 
        ConflictingDevice [
-               "DigitalMic"
-               "InternalMic-IN1"
-               "InternalMic-IN2"
-               "InternalMic-IN12"
-               "HeadsetMic-IN3"
+               "Mic"
        ]
 
        EnableSequence [
@@ -26,7 +22,9 @@ SectionDevice."HeadsetMic-IN2" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 200
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/rt5651/IN2-InternalMic.conf b/ucm2/codecs/rt5651/IN2-InternalMic.conf
index 611ca6c7553c40b3bf079fc09d945f4a049706f7..9eeef4d0b5a3430dfa41420e6672822e066ddddf 100644 (file)
--- a/ucm2/codecs/rt5651/IN2-InternalMic.conf
+++ b/ucm2/codecs/rt5651/IN2-InternalMic.conf
@@ -1,14 +1,6 @@
-SectionDevice."InternalMic-IN2" {
+SectionDevice."Mic" {
        Comment "Internal Microphone on IN2"
 
-       ConflictingDevice [
-               "DigitalMic"
-               "InternalMic-IN1"
-               "InternalMic-IN12"
-               "HeadsetMic-IN2"
-               "HeadsetMic-IN3"
-       ]
-
        EnableSequence [
                cset "name='Internal Mic Switch' on"
                cset "name='RECMIXL BST2 Switch' on"
@@ -26,6 +18,8 @@ SectionDevice."InternalMic-IN2" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 100
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/IN3-HeadsetMic.conf b/ucm2/codecs/rt5651/IN3-HeadsetMic.conf
index 3231e78e4e2d58f4f93c860a0e2f113d00ef7fd9..d579dcd8504e2c2941104d26c6fc5d0368dd4076 100644 (file)
--- a/ucm2/codecs/rt5651/IN3-HeadsetMic.conf
+++ b/ucm2/codecs/rt5651/IN3-HeadsetMic.conf
@@ -1,12 +1,8 @@
-SectionDevice."HeadsetMic-IN3" {
+SectionDevice."Headset" {
        Comment "Headset Microphone on IN3"
 
        ConflictingDevice [
-               "DigitalMic"
-               "InternalMic-IN1"
-               "InternalMic-IN2"
-               "InternalMic-IN12"
-               "HeadsetMic-IN2"
+               "Mic"
        ]
 
        EnableSequence [
@@ -26,7 +22,9 @@ SectionDevice."HeadsetMic-IN3" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 200
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/rt5651/MonoSpeaker.conf b/ucm2/codecs/rt5651/MonoSpeaker.conf
index c2276c6fbbeea7e6db729cfe46f4f8b6db0d1204..9c780a0bbf52fde5ac9e26fa0c7f0916f65c53ee 100644 (file)
--- a/ucm2/codecs/rt5651/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5651/MonoSpeaker.conf
@@ -1,8 +1,7 @@
-SectionDevice."MonoSpeaker" {
+SectionDevice."Speaker" {
        Comment "Mono Speaker"
 
        ConflictingDevice [
-               "Speaker"
                "Headphones"
        ]
 
@@ -42,6 +41,8 @@ SectionDevice."MonoSpeaker" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/Speaker.conf b/ucm2/codecs/rt5651/Speaker.conf
index 463d13b5525c988d54a9d30e88b4f2fce07404dd..efc12e54fc8b62fa3267922d182c84684e4cabfd 100644 (file)
--- a/ucm2/codecs/rt5651/Speaker.conf
+++ b/ucm2/codecs/rt5651/Speaker.conf
@@ -2,7 +2,6 @@ SectionDevice."Speaker" {
        Comment "Speakers"
 
        ConflictingDevice [
-               "MonoSpeaker"
                "Headphones"
        ]
 
@@ -24,6 +23,8 @@ SectionDevice."Speaker" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
        }
 }