From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 4 Feb 2020 18:11:10 +0000 (+0100)
Subject: PandaBoard: corrections and fixes
X-Git-Tag: android-x86-8.1-r6~188
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e7ea2a0d7afe51447e7efb71f8f03c39b6fcb64;p=android-x86%2Fexternal-alsa-ucm-conf.git

PandaBoard: corrections and fixes

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

diff --git a/ucm2/PandaBoard/FMAnalog.conf b/ucm2/PandaBoard/FMAnalog.conf
index 11a2288..29cbbe8 100644
--- a/ucm2/PandaBoard/FMAnalog.conf
+++ b/ucm2/PandaBoard/FMAnalog.conf
@@ -17,10 +17,9 @@ SectionVerb {
                 cset "name='Capture Volume' 0"
 	]
 
-	# Optional TQ and ALSA PCMs
+	# Optional TQ
 	Value {
 		TQ "Music"
-                CapturePCM "hw:${CardId},0"
 	}
 }
 
@@ -38,5 +37,9 @@ SectionDevice."Headset" {
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"
 	]
-}
 
+	Value {
+		CapturePriority 100
+		CapturePCM "hw:${CardId}"
+	}
+}
diff --git a/ucm2/PandaBoard/HiFi.conf b/ucm2/PandaBoard/HiFi.conf
index 1b16125..5de0c8f 100644
--- a/ucm2/PandaBoard/HiFi.conf
+++ b/ucm2/PandaBoard/HiFi.conf
@@ -26,13 +26,10 @@ SectionVerb {
                 cset "name='Headset Playback Volume' 0"
 	]
 
- 	# Optional TQ and ALSA PCMs
-#	Value {
-#		TQ "Music"
-#		PlaybackPCM "hw:${CardId},0"
-#                PlaybackVolume "name='DL1 Media Playback Volume' 90,90"
-#                PlaybackSwitch "name='DL1 PDM Switch' 1"
-#	}
+ 	# Optional TQ
+	Value {
+		TQ "Music"
+	}
 }
 
 SectionDevice."Headset" {
@@ -49,4 +46,11 @@ SectionDevice."Headset" {
 		cset "name='Headset Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
 	]
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId}"
+		# PlaybackVolume "name='DL1 Media Playback Volume' 90,90"
+		# PlaybackSwitch "name='DL1 PDM Switch' 1"
+	}
 }
diff --git a/ucm2/PandaBoard/HiFiLP.conf b/ucm2/PandaBoard/HiFiLP.conf
index 92de382..c735248 100644
--- a/ucm2/PandaBoard/HiFiLP.conf
+++ b/ucm2/PandaBoard/HiFiLP.conf
@@ -18,10 +18,9 @@ SectionVerb {
                 cset "name='SDT DL Volume' 0"
 	]
 
-	# Optional TQ and ALSA PCMs
+	# Optional TQ
 	Value {
 		TQ "Music"
-		PlaybackPCM "hw:${CardId},6"
 	}
 }
 
@@ -39,4 +38,9 @@ SectionDevice."Headset" {
 		cset "name='Headset Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
 	]
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId},6"
+	}
 }
diff --git a/ucm2/PandaBoard/Record.conf b/ucm2/PandaBoard/Record.conf
index 1fbe74c..e88d6c3 100644
--- a/ucm2/PandaBoard/Record.conf
+++ b/ucm2/PandaBoard/Record.conf
@@ -18,10 +18,9 @@ SectionVerb {
                 cset "name='Capture Volume' 0"
 	]
 
-	# Optional TQ and ALSA PCMs
+	# Optional TQ
 	Value {
 		TQ "Music"
-		CapturePCM "hw:${CardId},0"
 	}
 
 }
@@ -40,4 +39,9 @@ SectionDevice."Headset" {
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"
 	]
+
+	Value {
+		CapturePriority 100
+		CapturePCM "hw:${CardId}"
+	}
 }
diff --git a/ucm2/PandaBoard/Voice.conf b/ucm2/PandaBoard/Voice.conf
index 42af48a..6843cc8 100644
--- a/ucm2/PandaBoard/Voice.conf
+++ b/ucm2/PandaBoard/Voice.conf
@@ -18,10 +18,9 @@ SectionVerb {
                 cset "name='SDT DL Volume' 0"
 	]
 
-	# Optional TQ and ALSA PCMs
+	# Optional TQ
 	Value {
 		TQ "Voice"
-		PlaybackPCM "hw:${CardId},2"
 	}
 }
 
@@ -39,4 +38,9 @@ SectionDevice."Headset" {
 		cset "name='Headset Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
 	]
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId},2"
+	}
 }
diff --git a/ucm2/PandaBoard/VoiceCall.conf b/ucm2/PandaBoard/VoiceCall.conf
index c20bf5c..9a8099e 100644
--- a/ucm2/PandaBoard/VoiceCall.conf
+++ b/ucm2/PandaBoard/VoiceCall.conf
@@ -31,11 +31,9 @@ SectionVerb {
                 cset "name='SDT DL Volume' 0"
 	]
 
-	# Optional TQ and ALSA PCMs
+	# Optional TQ
 	Value {
 		TQ "Voice"
-                CapturePCM "hw:${CardId},2"
-		PlaybackPCM "hw:${CardId},2"
 	}
 }
 
@@ -59,5 +57,11 @@ SectionDevice."Headset" {
 		cset "name='Headset Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
 	]
-}
 
+	Value {
+		CapturePriority 100
+                CapturePCM "hw:${CardId},2"
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId},2"
+	}
+}