bytcht-es8316: corrections and fixes

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

diff --git a/ucm2/bytcht-es8316/HiFi.conf b/ucm2/bytcht-es8316/HiFi.conf
index 768f0109babdab6fe52dd5583f5650e2f9239ef2..af053d09421c76f80cc9a8a5a5f03c4bab4d1f2e 100644 (file)
--- a/ucm2/bytcht-es8316/HiFi.conf
+++ b/ucm2/bytcht-es8316/HiFi.conf
@@ -7,11 +7,6 @@ SectionVerb {
        DisableSequence [
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
-
-       Value {
-               PlaybackPCM "hw:${CardId}"
-               CapturePCM "hw:${CardId}"
-       }
 }
 
 If.0 {

diff --git a/ucm2/codecs/es8316/HeadPhones.conf b/ucm2/codecs/es8316/HeadPhones.conf
index 603b40c2e6c157384391d8eddff65932dd4bfa8c..6a05e5488979a8f57601286e7388b3cf8f35f243 100644 (file)
--- a/ucm2/codecs/es8316/HeadPhones.conf
+++ b/ucm2/codecs/es8316/HeadPhones.conf
@@ -15,7 +15,7 @@ SectionDevice."Headphones" {
 
        Value {
                PlaybackPriority 200
-               PlaybackPCM "hw:${CardId},0"
+               PlaybackPCM "hw:${CardId}"
                PlaybackChannels 2
                JackControl "Headphone Jack"
                JackHWMute "Speaker"

diff --git a/ucm2/codecs/es8316/IN1-HeadsetMic.conf b/ucm2/codecs/es8316/IN1-HeadsetMic.conf
index d798270dd4445994c71acd692ff21f97bdb1e85a..e9f90614c6461a5d59bbee28b311b96ce7ace1e5 100644 (file)
--- a/ucm2/codecs/es8316/IN1-HeadsetMic.conf
+++ b/ucm2/codecs/es8316/IN1-HeadsetMic.conf
@@ -16,7 +16,7 @@ SectionDevice."Headset" {
 
        Value {
                CapturePriority 200
-               CapturePCM "hw:${CardId},0"
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
                JackControl "Headset Mic Jack"
        }

diff --git a/ucm2/codecs/es8316/IN2-HeadsetMic.conf b/ucm2/codecs/es8316/IN2-HeadsetMic.conf
index 28f26f8d4c4d762ec8635997582795690aacd81e..377d84d3a0f2c10f5b27df70c3ee2c5c9b045267 100644 (file)
--- a/ucm2/codecs/es8316/IN2-HeadsetMic.conf
+++ b/ucm2/codecs/es8316/IN2-HeadsetMic.conf
@@ -16,7 +16,7 @@ SectionDevice."Headset" {
 
        Value {
                CapturePriority 200
-               CapturePCM "hw:${CardId},0"
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
                JackControl "Headset Mic Jack"
        }

diff --git a/ucm2/codecs/es8316/IN2-InternalMic.conf b/ucm2/codecs/es8316/IN2-InternalMic.conf
index 8c0418fde5baeca98e6f6b3350ffb9af24b42ae6..f0ff6f183f5ae81b69eac96025fcc05415a54408 100644 (file)
--- a/ucm2/codecs/es8316/IN2-InternalMic.conf
+++ b/ucm2/codecs/es8316/IN2-InternalMic.conf
@@ -2,9 +2,7 @@ SectionDevice."Mic" {
        Comment "Internal Microphone on IN2"
 
        ConflictingDevice [
-               "InternalMic-IN1"
-               "HeadsetMic-IN1"
-               "HeadsetMic-IN2"
+               "Headset"
        ]
 
        EnableSequence [
@@ -18,7 +16,7 @@ SectionDevice."Mic" {
 
        Value {
                CapturePriority 100
-               CapturePCM "hw:${CardId},0"
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/es8316/MonoSpeaker.conf b/ucm2/codecs/es8316/MonoSpeaker.conf
index f11f2b7f2d417eba7e976e25ba047a5f2c80a208..64a7e76046a024966584f419001ebbbd64bff2d4 100644 (file)
--- a/ucm2/codecs/es8316/MonoSpeaker.conf
+++ b/ucm2/codecs/es8316/MonoSpeaker.conf
@@ -32,7 +32,7 @@ SectionDevice."Speaker" {
 
        Value {
                PlaybackPriority 100
-               PlaybackPCM "hw:${CardId},0"
+               PlaybackPCM "hw:${CardId}"
                PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/es8316/Speaker.conf b/ucm2/codecs/es8316/Speaker.conf
index a1e4491a85774f9f933701d41ae9ed0719b9ac3b..58fe078409eeb91fa9df2561558061beeb634694 100644 (file)
--- a/ucm2/codecs/es8316/Speaker.conf
+++ b/ucm2/codecs/es8316/Speaker.conf
@@ -2,7 +2,6 @@ SectionDevice."Speaker" {
        Comment "Speakers"
 
        ConflictingDevice [
-               "MonoSpeaker"
                "Headphones"
        ]
 
@@ -16,7 +15,7 @@ SectionDevice."Speaker" {
 
        Value {
                PlaybackPriority 100
-               PlaybackPCM "hw:${CardId},0"
+               PlaybackPCM "hw:${CardId}"
                PlaybackChannels 2
        }
 }