bytcr-rt5640: cleanups and corrections

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

diff --git a/ucm2/codecs/rt5640/DigitalMics.conf b/ucm2/codecs/rt5640/DigitalMics.conf
index 36982c476317ffcb339167b2cd83dba8ad0980bd..17cae1953677dcbf4b1e2886e0e73f241dfa9d5f 100644 (file)
--- a/ucm2/codecs/rt5640/DigitalMics.conf
+++ b/ucm2/codecs/rt5640/DigitalMics.conf
@@ -1,10 +1,8 @@
-SectionDevice."DigitalMics" {
+SectionDevice."Mic" {
        Comment "Internal Digital Microphones"
 
        ConflictingDevice [
-               "IN1-InternalMics"
-               "IN3-InternalMics"
-               "HeadsetMic"
+               "Headset"
        ]
 
        EnableSequence [
@@ -22,6 +20,8 @@ SectionDevice."DigitalMics" {
        ]
 
        Value {
+               CapturePriority 100
+               CapturePCM "hw:${CardId},0"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/HeadPhones.conf b/ucm2/codecs/rt5640/HeadPhones.conf
index e37442dc73f8b82e1dd03994e106a5e2093c7b0e..dccc943490c17017ec4070775ba2209ed6940593 100644 (file)
--- a/ucm2/codecs/rt5640/HeadPhones.conf
+++ b/ucm2/codecs/rt5640/HeadPhones.conf
@@ -32,7 +32,9 @@ SectionDevice."Headphones" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 300
+               PlaybackPCM "hw:${CardId},0"
+               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 }

diff --git a/ucm2/codecs/rt5640/HeadsetMic.conf b/ucm2/codecs/rt5640/HeadsetMic.conf
index a99b29533cedaa59c16ec8706b9501e95bdb4fa9..f6d9423963ac807a03429c54e92d11be6d738801 100644 (file)
--- a/ucm2/codecs/rt5640/HeadsetMic.conf
+++ b/ucm2/codecs/rt5640/HeadsetMic.conf
@@ -1,10 +1,8 @@
-SectionDevice."HeadsetMic" {
+SectionDevice."Headset" {
        Comment "Headset Microphone"
 
        ConflictingDevice [
-               "IN1-InternalMics"
-               "IN3-InternalMics"
-               "DigitalMics"
+               "Mic"
        ]
 
        EnableSequence [
@@ -38,6 +36,8 @@ SectionDevice."HeadsetMic" {
        ]
 
        Value {
+               CapturePriority 200
+               CapturePCM "hw:${CardId},0"
                CaptureChannels 2
                JackControl "Headset Mic Jack"
        }

diff --git a/ucm2/codecs/rt5640/IN1-InternalMic.conf b/ucm2/codecs/rt5640/IN1-InternalMic.conf
index 95fc89eb4c58faa5d8da2f2f56e97df4ef6231dd..435cce83dc1348ab8e8fe9387c04ec68b02949f4 100644 (file)
--- a/ucm2/codecs/rt5640/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN1-InternalMic.conf
@@ -1,10 +1,8 @@
-SectionDevice."IN1-InternalMics" {
+SectionDevice."Mic" {
        Comment "Internal Microphone on IN1"
 
        ConflictingDevice [
-               "DigitalMics"
                "HeadsetMic"
-               "IN3-InternalMics"
        ]
 
        EnableSequence [
@@ -41,6 +39,8 @@ SectionDevice."IN1-InternalMics" {
        ]
 
        Value {
+               CapturePriority 100
+               CapturePCM "hw:${CardId},0"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/IN3-InternalMic.conf b/ucm2/codecs/rt5640/IN3-InternalMic.conf
index b8270e9605faebea9bdcd030e365d17967db6b37..4d4060e2332405ad7eb46380e3f4d526a9c33a0c 100644 (file)
--- a/ucm2/codecs/rt5640/IN3-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN3-InternalMic.conf
@@ -1,10 +1,8 @@
-SectionDevice."IN3-InternalMics" {
+SectionDevice."Mic" {
        Comment "Internal Microphone on IN3"
 
        ConflictingDevice [
-               "DigitalMics"
-               "HeadsetMic"
-               "IN1-InternalMics"
+               "Headset"
        ]
 
        EnableSequence [
@@ -41,6 +39,8 @@ SectionDevice."IN3-InternalMics" {
        ]
 
        Value {
+               CapturePriority 100
+               CapturePCM "hw:${CardId},0"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/MonoSpeaker.conf b/ucm2/codecs/rt5640/MonoSpeaker.conf
index ee4eff31f6c7e2678cba60a303e4c86b71c1e96e..6ca51e2397d1429ca2d5183f2d917ca34e1e0287 100644 (file)
--- a/ucm2/codecs/rt5640/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5640/MonoSpeaker.conf
@@ -1,4 +1,4 @@
-SectionDevice."MonoSpeaker" {
+SectionDevice."Speaker" {
        Comment "Mono Speaker"
 
        ConflictingDevice [
@@ -37,6 +37,8 @@ SectionDevice."MonoSpeaker" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId},0"
+               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/Speaker.conf b/ucm2/codecs/rt5640/Speaker.conf
index 564a6b308ce6d599d98e90f3e613d8270fba28b6..09b99cf6410dc61c4d4df62ddfa0b025ed116bf2 100644 (file)
--- a/ucm2/codecs/rt5640/Speaker.conf
+++ b/ucm2/codecs/rt5640/Speaker.conf
@@ -37,6 +37,8 @@ SectionDevice."Speaker" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPCM "hw:${CardId},0"
+               PlaybackPriority 100
+               PlaybackChannels 2
        }
 }