From d3f84e3bcc0dd069b8b7c12107958f23e9a9c80e Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 10 Nov 2019 21:07:36 +0100
Subject: [PATCH] DB820c: adapt to ucm2

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 {ucm => ucm2}/DB820c/DB820c.conf |  2 ++
 {ucm => ucm2}/DB820c/HDMI.conf   |  0
 {ucm => ucm2}/DB820c/HiFi.conf   | 21 +++++----------------
 3 files changed, 7 insertions(+), 16 deletions(-)
 rename {ucm => ucm2}/DB820c/DB820c.conf (93%)
 rename {ucm => ucm2}/DB820c/HDMI.conf (100%)
 rename {ucm => ucm2}/DB820c/HiFi.conf (89%)

diff --git a/ucm/DB820c/DB820c.conf b/ucm2/DB820c/DB820c.conf
similarity index 93%
rename from ucm/DB820c/DB820c.conf
rename to ucm2/DB820c/DB820c.conf
index 1be157d..7eab8aa 100644
--- a/ucm/DB820c/DB820c.conf
+++ b/ucm2/DB820c/DB820c.conf
@@ -1,3 +1,5 @@
+Syntax 2
+
 SectionUseCase."HiFi" {
 	File "HiFi.conf"
 	Comment "HiFi quality Music"
diff --git a/ucm/DB820c/HDMI.conf b/ucm2/DB820c/HDMI.conf
similarity index 100%
rename from ucm/DB820c/HDMI.conf
rename to ucm2/DB820c/HDMI.conf
diff --git a/ucm/DB820c/HiFi.conf b/ucm2/DB820c/HiFi.conf
similarity index 89%
rename from ucm/DB820c/HiFi.conf
rename to ucm2/DB820c/HiFi.conf
index 4457329..39911d9 100644
--- a/ucm/DB820c/HiFi.conf
+++ b/ucm2/DB820c/HiFi.conf
@@ -4,7 +4,6 @@
 SectionVerb {
 
 	EnableSequence [
-		cdev "hw:0"
 		cset "name='SLIM RX0 MUX' ZERO"
 		cset "name='SLIM RX1 MUX' ZERO"
 		cset "name='SLIM RX2 MUX' ZERO"
@@ -31,24 +30,15 @@ SectionVerb {
 	]
 
 	DisableSequence [
-                cdev "hw:0"
 		cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0"
 		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
 	]
-
-	# ALSA PCM
-	Value {
-		# ALSA PCM device for HiFi
-		PlaybackPCM "plughw:0,1"
-		CapturePCM "plughw:0,2"
-	}
 }
 
-SectionDevice."Headphones" {
-	Comment "Headphones playback"
+SectionDevice."Headphone" {
+	Comment "Headphone playback"
 
 	EnableSequence [
-		cdev "hw:0"
 		cset "name='SLIM RX0 MUX' ZERO"
 		cset "name='SLIM RX1 MUX' ZERO"
 		cset "name='SLIM RX2 MUX' ZERO"
@@ -69,7 +59,6 @@ SectionDevice."Headphones" {
 	]
 
 	DisableSequence [
-		cdev "hw:0"
 		cset "name='RX5 Digital Volume' 0"
 		cset "name='RX6 Digital Volume' 0"
 		cset "name='SLIM RX5 MUX' ZERO"
@@ -78,15 +67,15 @@ SectionDevice."Headphones" {
 	]
 
 	Value {
+		PlaybackPCM "plughw:${CardId},1"
 		PlaybackChannels "2"
 	}
 }
 
-SectionDevice."Handset" {
+SectionDevice."HandsetMic" {
 	Comment "Headset Microphone"
 
 	EnableSequence [
-		cdev "hw:0"
 		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
 		cset "name='AIF1_CAP Mixer SLIM TX0' 1"
 		cset "name='SLIM TX0 MUX' DEC0"
@@ -96,7 +85,6 @@ SectionDevice."Handset" {
 	]
 
 	DisableSequence [
-		cdev "hw:0"
 		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
 		cset "name='AIF1_CAP Mixer SLIM TX0' 0"
 		cset "name='AMIC MUX0' ZERO"
@@ -105,6 +93,7 @@ SectionDevice."Handset" {
 	]
 
 	Value {
+		CapturePCM "plughw:${CardId},2"
 		CaptureChannels "1"
 	}
 }
-- 
2.47.1