bytcht-es8316: corrections and fixes

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

7 files changed, 7 insertions, 15 deletions

diff --git a/ucm2/bytcht-es8316/HiFi.conf b/ucm2/bytcht-es8316/HiFi.conf
index 768f010..af053d0 100644
--- 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 603b40c..6a05e54 100644
--- 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 d798270..e9f9061 100644
--- 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 28f26f8..377d84d 100644
--- 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 8c0418f..f0ff6f1 100644
--- 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 f11f2b7..64a7e76 100644
--- 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 a1e4491..58fe078 100644
--- 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
 	}
 }