bytcr-rt5640: corrections and fixes

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

diff --git a/ucm2/bytcr-rt5640/HiFi.conf b/ucm2/bytcr-rt5640/HiFi.conf
index a616106d38c37579cd33f2736420712fb56f6093..e71eb2266110ed49b7c1191ed4bccdb386047be5 100644 (file)
--- a/ucm2/bytcr-rt5640/HiFi.conf
+++ b/ucm2/bytcr-rt5640/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/rt5640/DigitalMics.conf b/ucm2/codecs/rt5640/DigitalMics.conf
index 17cae1953677dcbf4b1e2886e0e73f241dfa9d5f..9cd8a8c4d9cd1caec4443651041381d6ace88958 100644 (file)
--- a/ucm2/codecs/rt5640/DigitalMics.conf
+++ b/ucm2/codecs/rt5640/DigitalMics.conf
@@ -21,7 +21,7 @@ SectionDevice."Mic" {
 
        Value {
                CapturePriority 100
-               CapturePCM "hw:${CardId},0"
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/HeadPhones.conf b/ucm2/codecs/rt5640/HeadPhones.conf
index dccc943490c17017ec4070775ba2209ed6940593..7859b7a6bfb3021dfbac55fc8e60673c468c3f15 100644 (file)
--- a/ucm2/codecs/rt5640/HeadPhones.conf
+++ b/ucm2/codecs/rt5640/HeadPhones.conf
@@ -3,7 +3,6 @@ SectionDevice."Headphones" {
 
        ConflictingDevice [
                "Speaker"
-               "MonoSpeaker"
        ]
 
        EnableSequence [
@@ -33,7 +32,7 @@ SectionDevice."Headphones" {
 
        Value {
                PlaybackPriority 300
-               PlaybackPCM "hw:${CardId},0"
+               PlaybackPCM "hw:${CardId}"
                PlaybackChannels 2
                JackControl "Headphone Jack"
        }

diff --git a/ucm2/codecs/rt5640/HeadsetMic.conf b/ucm2/codecs/rt5640/HeadsetMic.conf
index f6d9423963ac807a03429c54e92d11be6d738801..40e0abedd5f70e319c02965c6cdcf289bbab320a 100644 (file)
--- a/ucm2/codecs/rt5640/HeadsetMic.conf
+++ b/ucm2/codecs/rt5640/HeadsetMic.conf
@@ -37,7 +37,7 @@ SectionDevice."Headset" {
 
        Value {
                CapturePriority 200
-               CapturePCM "hw:${CardId},0"
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
                JackControl "Headset Mic Jack"
        }

diff --git a/ucm2/codecs/rt5640/IN1-InternalMic.conf b/ucm2/codecs/rt5640/IN1-InternalMic.conf
index 435cce83dc1348ab8e8fe9387c04ec68b02949f4..7d76c4f17d41fa6a5721e305a0e6d86b2b345885 100644 (file)
--- a/ucm2/codecs/rt5640/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN1-InternalMic.conf
@@ -2,7 +2,7 @@ SectionDevice."Mic" {
        Comment "Internal Microphone on IN1"
 
        ConflictingDevice [
-               "HeadsetMic"
+               "Headset"
        ]
 
        EnableSequence [
@@ -40,7 +40,7 @@ SectionDevice."Mic" {
 
        Value {
                CapturePriority 100
-               CapturePCM "hw:${CardId},0"
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/IN3-InternalMic.conf b/ucm2/codecs/rt5640/IN3-InternalMic.conf
index 4d4060e2332405ad7eb46380e3f4d526a9c33a0c..2df29386d1f855e76061122f8c1200d1879f3396 100644 (file)
--- a/ucm2/codecs/rt5640/IN3-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN3-InternalMic.conf
@@ -40,7 +40,7 @@ SectionDevice."Mic" {
 
        Value {
                CapturePriority 100
-               CapturePCM "hw:${CardId},0"
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/MonoSpeaker.conf b/ucm2/codecs/rt5640/MonoSpeaker.conf
index 6ca51e2397d1429ca2d5183f2d917ca34e1e0287..70ab80922fb1cb100cbef4472b50d59d48cfc1ab 100644 (file)
--- a/ucm2/codecs/rt5640/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5640/MonoSpeaker.conf
@@ -3,7 +3,6 @@ SectionDevice."Speaker" {
 
        ConflictingDevice [
                "Headphones"
-               "Speaker"
        ]
 
        EnableSequence [
@@ -38,7 +37,7 @@ SectionDevice."Speaker" {
 
        Value {
                PlaybackPriority 100
-               PlaybackPCM "hw:${CardId},0"
+               PlaybackPCM "hw:${CardId}"
                PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/Speaker.conf b/ucm2/codecs/rt5640/Speaker.conf
index 09b99cf6410dc61c4d4df62ddfa0b025ed116bf2..3b4b2968fb56c67313aaf5680fe53f3da0a24fdd 100644 (file)
--- a/ucm2/codecs/rt5640/Speaker.conf
+++ b/ucm2/codecs/rt5640/Speaker.conf
@@ -3,7 +3,6 @@ SectionDevice."Speaker" {
 
        ConflictingDevice [
                "Headphones"
-               "MonoSpeaker"
        ]
 
        EnableSequence [
@@ -37,8 +36,8 @@ SectionDevice."Speaker" {
        ]
 
        Value {
-               PlaybackPCM "hw:${CardId},0"
                PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
                PlaybackChannels 2
        }
 }