From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 27 Jan 2020 15:06:25 +0000 (+0100)
Subject: SDP4430: corrections and fixes
X-Git-Tag: v1.2.2~19
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=35c2bba4906a278d876503855c55c2e7f9247616;p=alsa-ucm-conf.git

SDP4430: corrections and fixes

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

diff --git a/ucm2/SDP4430/FMAnalog.conf b/ucm2/SDP4430/FMAnalog.conf
index 9681465..2cfabf9 100644
--- a/ucm2/SDP4430/FMAnalog.conf
+++ b/ucm2/SDP4430/FMAnalog.conf
@@ -9,19 +9,12 @@ SectionVerb {
                 cset "name='Capture Volume' 4"
 	]
 
-
 	DisableSequence [
                 cset "name='AMIC_UL PDM Switch' 0"
                 cset "name='MUX_UL00' 0"
                 cset "name='MUX_UL01' 0"
                 cset "name='Capture Volume' 0"
 	]
-
-	# Optional TQ and ALSA PCMs
-	Value {
-		TQ "Music"
-                CapturePCM "hw:${CardId},0"
-	}
 }
 
 SectionDevice."Headset" {
@@ -38,5 +31,9 @@ SectionDevice."Headset" {
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"
 	]
+
+	Value {
+                CapturePCM "hw:${CardId},0"
+	}
 }
 
diff --git a/ucm2/SDP4430/HiFiLP.conf b/ucm2/SDP4430/HiFiLP.conf
index 51380d9..731ac21 100644
--- a/ucm2/SDP4430/HiFiLP.conf
+++ b/ucm2/SDP4430/HiFiLP.conf
@@ -18,10 +18,8 @@ SectionVerb {
                 cset "name='SDT DL Volume' 0"
 	]
 
-	# Optional TQ and ALSA PCMs
 	Value {
 		TQ "Music"
-		PlaybackPCM "hw:${CardId},6"
 	}
 }
 
@@ -39,4 +37,9 @@ SectionDevice."Headset" {
 		cset "name='HS Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
 	]
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId},6"
+	}
 }
diff --git a/ucm2/SDP4430/Record.conf b/ucm2/SDP4430/Record.conf
index 9f62fd1..d3c4955 100644
--- a/ucm2/SDP4430/Record.conf
+++ b/ucm2/SDP4430/Record.conf
@@ -19,7 +19,6 @@ SectionVerb {
 	# Optional TQ and ALSA PCMs
 	Value {
 		TQ "Music"
-		CapturePCM "hw:${CardId},0"
 	}
 
 }
@@ -38,4 +37,8 @@ SectionDevice."Headset" {
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"
 	]
+
+	Value {
+		CapturePCM "hw:${CardId},0"
+	}
 }
diff --git a/ucm2/SDP4430/SDP4430.conf b/ucm2/SDP4430/SDP4430.conf
index df5b5b9..fd95890 100644
--- a/ucm2/SDP4430/SDP4430.conf
+++ b/ucm2/SDP4430/SDP4430.conf
@@ -13,7 +13,7 @@ SectionUseCase."HiFi" {
 }
 
 SectionUseCase."HiFi_Low_Power" {
-	File "HiHiLP.conf"
+	File "HiFiLP.conf"
 	Comment "Play HiFi quality Music in Low Power Mode"
 }
 
diff --git a/ucm2/SDP4430/Voice.conf b/ucm2/SDP4430/Voice.conf
index 7d10a17..15cd4f0 100644
--- a/ucm2/SDP4430/Voice.conf
+++ b/ucm2/SDP4430/Voice.conf
@@ -18,10 +18,8 @@ SectionVerb {
                 cset "name='SDT DL Volume' 0"
 	]
 
-	# Optional TQ and ALSA PCMs
 	Value {
 		TQ "Voice"
-		PlaybackPCM "hw:${CardId},2"
 	}
 }
 
@@ -39,4 +37,8 @@ SectionDevice."Headset" {
 		cset "name='HS Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
 	]
+
+	Value {
+		PlaybackPCM "hw:${CardId},2"
+	}
 }
diff --git a/ucm2/SDP4430/VoiceAll.conf b/ucm2/SDP4430/VoiceCall.conf
similarity index 98%
rename from ucm2/SDP4430/VoiceAll.conf
rename to ucm2/SDP4430/VoiceCall.conf
index 07843c5..2f02a2b 100644
--- a/ucm2/SDP4430/VoiceAll.conf
+++ b/ucm2/SDP4430/VoiceCall.conf
@@ -31,11 +31,8 @@ SectionVerb {
                 cset "name='SDT DL Volume' 0"
 	]
 
-	# Optional TQ and ALSA PCMs
 	Value {
 		TQ "Voice"
-                CapturePCM "hw:${CardId},2"
-		PlaybackPCM "hw:${CardId},2"
 	}
 }
 
@@ -59,5 +56,9 @@ SectionDevice."Headset" {
 		cset "name='HS Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
 	]
-}
 
+	Value {
+                CapturePCM "hw:${CardId},2"
+		PlaybackPCM "hw:${CardId},2"
+	}
+}