From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 5 Feb 2020 02:13:06 +0000 (+0100)
Subject: bytcr-rt5640: corrections and fixes
X-Git-Tag: v1.2.2~6
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=1e2eddb7e38474f239f9c8f9387c7a04a1bff7e3;p=alsa-ucm-conf.git

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 a616106..e71eb22 100644
--- 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 17cae19..9cd8a8c 100644
--- 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 dccc943..7859b7a 100644
--- 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 f6d9423..40e0abe 100644
--- 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 435cce8..7d76c4f 100644
--- 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 4d4060e..2df2938 100644
--- 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 6ca51e2..70ab809 100644
--- 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 09b99cf..3b4b296 100644
--- 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
 	}
 }