bytcht-cx2072x: cleanups and corrections

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

diff --git a/ucm2/bytcht-cx2072x/HiFi.conf b/ucm2/bytcht-cx2072x/HiFi.conf
index 60e022974790677a7371d45ffe4d30cf456c8141..b329ea4ed399c13f4af5381435d86f2e1c38f135 100644 (file)
--- a/ucm2/bytcht-cx2072x/HiFi.conf
+++ b/ucm2/bytcht-cx2072x/HiFi.conf
@@ -8,11 +8,6 @@ SectionVerb {
                <codecs/cx2072x/DisableSeq.conf>
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
-
-       Value {
-               PlaybackPCM "hw:${CardId}"
-               CapturePCM "hw:${CardId}"
-       }
 }
 
 <codecs/cx2072x/Speaker.conf>

diff --git a/ucm2/codecs/cx2072x/HeadPhones.conf b/ucm2/codecs/cx2072x/HeadPhones.conf
index b5d3d3a15402b6fffa76dc81f6daffe1cac8fcf5..484d020be7e890c6ab556512896fba321f45cd4a 100644 (file)
--- a/ucm2/codecs/cx2072x/HeadPhones.conf
+++ b/ucm2/codecs/cx2072x/HeadPhones.conf
@@ -16,7 +16,9 @@ SectionDevice."Headphones" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 }

diff --git a/ucm2/codecs/cx2072x/HeadsetMic.conf b/ucm2/codecs/cx2072x/HeadsetMic.conf
index 0a59750f8f4a437092e307c9dac056984ac887d4..b1a777114df4ff470a4bd9483d61580fc0879b67 100644 (file)
--- a/ucm2/codecs/cx2072x/HeadsetMic.conf
+++ b/ucm2/codecs/cx2072x/HeadsetMic.conf
@@ -1,8 +1,8 @@
-SectionDevice."HeadsetMic" {
+SectionDevice."Headset" {
        Comment "Headset Microphone"
 
        ConflictingDevice [
-               "InternalMic"
+               "Mic"
        ]
 
        EnableSequence [
@@ -17,7 +17,9 @@ SectionDevice."HeadsetMic" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 200
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/cx2072x/InternalMic.conf b/ucm2/codecs/cx2072x/InternalMic.conf
index e358c35c1847b8328092697222cd04a0b965ac79..831c3cc63f5cb65408aaaed4fdc6163da1c4a5d8 100644 (file)
--- a/ucm2/codecs/cx2072x/InternalMic.conf
+++ b/ucm2/codecs/cx2072x/InternalMic.conf
@@ -1,8 +1,8 @@
-SectionDevice."InternalMic" {
+SectionDevice."Mic" {
        Comment "Internal Microphone"
 
        ConflictingDevice [
-               "HeadsetMic"
+               "Headset"
        ]
 
        EnableSequence [
@@ -17,6 +17,8 @@ SectionDevice."InternalMic" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 100
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/cx2072x/Speaker.conf b/ucm2/codecs/cx2072x/Speaker.conf
index a83aeae9a1d3f2c3eea9a255d45da9a01859c595..f60e3559d1f7bf78f2f991fdd007ad64343a71ed 100644 (file)
--- a/ucm2/codecs/cx2072x/Speaker.conf
+++ b/ucm2/codecs/cx2072x/Speaker.conf
@@ -16,6 +16,8 @@ SectionDevice."Speaker" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
        }
 }