chtnau8824: fixes and corrections

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

diff --git a/ucm2/chtnau8824/HiFi-mono.conf b/ucm2/chtnau8824/HiFi-mono.conf
index 3433d03b416cae81675796bb192f096574f88f4d..26d6a56d63740bac7fd2b81a4ce9d4ceb5e9d6d0 100644 (file)
--- a/ucm2/chtnau8824/HiFi-mono.conf
+++ b/ucm2/chtnau8824/HiFi-mono.conf
@@ -3,9 +3,6 @@ SectionVerb {
 
        Value {
                TQ "HiFi"
-               # ALSA PCM device for HiFi
-               PlaybackPCM "hw:${CardId}"
-               CapturePCM "hw:${CardId}"
        }
 
        EnableSequence [

diff --git a/ucm2/chtnau8824/HiFi.conf b/ucm2/chtnau8824/HiFi.conf
index 9f7ac74bba40b4c92941e1337699bfadea0683b1..fd8b741cf326f9fb2cfb7cded337f08e81e39741 100644 (file)
--- a/ucm2/chtnau8824/HiFi.conf
+++ b/ucm2/chtnau8824/HiFi.conf
@@ -1,13 +1,5 @@
 
 SectionVerb {
-
-       Value {
-               TQ "HiFi"
-               # ALSA PCM device for HiFi
-               PlaybackPCM "hw:${CardId}"
-               CapturePCM "hw:${CardId}"
-       }
-
        EnableSequence [
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/nau8824/EnableSeq.conf>

diff --git a/ucm2/codecs/nau8824/HeadPhones.conf b/ucm2/codecs/nau8824/HeadPhones.conf
index f35f4e20f21eaeae04b0c57f4b0e25f0887e0d20..6623365af66ef9b2757252ce6328c78456446739 100644 (file)
--- a/ucm2/codecs/nau8824/HeadPhones.conf
+++ b/ucm2/codecs/nau8824/HeadPhones.conf
@@ -2,12 +2,13 @@ SectionDevice."Headphones" {
        Comment "Headphones"
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 
        ConflictingDevice [
-               "MonoSpeaker"
                "Speaker"
        ]
 

diff --git a/ucm2/codecs/nau8824/HeadsetMic.conf b/ucm2/codecs/nau8824/HeadsetMic.conf
index bc17f9fde42105603925989dc317c3fcca2d2ed2..738163861d69b394a37f34c104200f656dd86b1e 100644 (file)
--- a/ucm2/codecs/nau8824/HeadsetMic.conf
+++ b/ucm2/codecs/nau8824/HeadsetMic.conf
@@ -1,13 +1,15 @@
-SectionDevice."HeadsetMic" {
+SectionDevice."Headset" {
        Comment "Headset Microphone"
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 300
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 
        ConflictingDevice [
-               "InternalMic"
+               "Mic"
        ]
 
        EnableSequence [

diff --git a/ucm2/codecs/nau8824/InternalMic.conf b/ucm2/codecs/nau8824/InternalMic.conf
index 3793d6435253dd99de1c28212720933ca6e96a82..731a261cf93a2a81d371aaec7d2e2648094508e2 100644 (file)
--- a/ucm2/codecs/nau8824/InternalMic.conf
+++ b/ucm2/codecs/nau8824/InternalMic.conf
@@ -1,13 +1,14 @@
-SectionDevice."InternalMic" {
+SectionDevice."Mic" {
        Comment "Internal Microphone"
 
        Value {
-               CaptureChannels "2"
-               CapturePriority "150"
+               CapturePriority 200
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
        }
 
        ConflictingDevice [
-               "HeadsetMic"
+               "Headset"
        ]
 
        EnableSequence [

diff --git a/ucm2/codecs/nau8824/MonoSpeaker.conf b/ucm2/codecs/nau8824/MonoSpeaker.conf
index 5321c8af1eaad357db6ed0fbe97d169ebccafbd0..b02a22cb682e2b4bfad050833ede74c1f80cf0df 100644 (file)
--- a/ucm2/codecs/nau8824/MonoSpeaker.conf
+++ b/ucm2/codecs/nau8824/MonoSpeaker.conf
@@ -1,12 +1,13 @@
-SectionDevice."MonoSpeaker" {
+SectionDevice."Speaker" {
        Comment "Mono Speaker"
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
        }
 
        ConflictingDevice [
-               "Speaker"
                "Headphones"
        ]
 

diff --git a/ucm2/codecs/nau8824/Speaker.conf b/ucm2/codecs/nau8824/Speaker.conf
index 474c37392b51ca69e8f8db414afea4b154b583d8..365879585a98c4451ced4e5aff867468d24315cc 100644 (file)
--- a/ucm2/codecs/nau8824/Speaker.conf
+++ b/ucm2/codecs/nau8824/Speaker.conf
@@ -2,11 +2,12 @@ SectionDevice."Speaker" {
        Comment "Speaker"
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
        }
 
        ConflictingDevice [
-               "MonoSpeaker"
                "Headphones"
        ]