From 6c56567a7cb31b183ea6b3df5a4cbdc1faeb5aac Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 21 Nov 2019 14:05:23 +0100
Subject: [PATCH] chtrt5650: adapt to ucm2

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 {ucm => ucm2}/chtrt5650/HiFi.conf      | 24 ++----------------------
 {ucm => ucm2}/chtrt5650/chtrt5650.conf |  0
 2 files changed, 2 insertions(+), 22 deletions(-)
 rename {ucm => ucm2}/chtrt5650/HiFi.conf (87%)
 rename {ucm => ucm2}/chtrt5650/chtrt5650.conf (100%)

diff --git a/ucm/chtrt5650/HiFi.conf b/ucm2/chtrt5650/HiFi.conf
similarity index 87%
rename from ucm/chtrt5650/HiFi.conf
rename to ucm2/chtrt5650/HiFi.conf
index 71df1f8..f11d683 100644
--- a/ucm/chtrt5650/HiFi.conf
+++ b/ucm2/chtrt5650/HiFi.conf
@@ -5,13 +5,11 @@ SectionVerb {
 		TQ "HiFi"
 
 		# ALSA PCM device for HiFi
-		PlaybackPCM "hw:chtrt5650"
-		CapturePCM "hw:chtrt5650"
+		PlaybackPCM "hw:${CardId}"
+		CapturePCM "hw:${CardId}"
 	}
 
 	EnableSequence [
-		cdev "hw:chtrt5650"
-
 		<platforms/bytcr/PlatformEnableSeq.conf>
 		<codecs/rt5645/EnableSeq.conf>
 
@@ -23,8 +21,6 @@ SectionVerb {
 	]
 
 	DisableSequence [
-		cdev "hw:chtrt5650"
-
 		<codecs/rt5645/DisableSeq.conf>
 	]
 }
@@ -41,14 +37,10 @@ SectionDevice."Speaker" {
 	]
 
 	EnableSequence [
-		cdev "hw:chtrt5650"
-
 		<codecs/rt5645/SpeakerEnableSeq.conf>
 	]
 
 	DisableSequence [
-		cdev "hw:chtrt5650"
-
 		cset "name='Ext Spk Switch' off"
 		cset "name='Speaker Channel Switch' off"
 	]
@@ -68,14 +60,10 @@ SectionDevice."Headphones" {
 	]
 
 	EnableSequence [
-		cdev "hw:chtrt5650"
-
 		<codecs/rt5645/HeadphonesEnableSeq.conf>
 	]
 
 	DisableSequence [
-		cdev "hw:chtrt5650"
-
 		cset "name='Headphone Switch' off"
 		cset "name='Headphone Channel Switch' off"
 	]
@@ -90,16 +78,12 @@ SectionDevice."Mic".0 {
 	}
 
 	EnableSequence [
-		cdev "hw:chtrt5650"
-
 		cset "name='Int Mic Switch' on"
 		cset "name='Sto1 ADC MIXL ADC2 Switch' on"
 		cset "name='Sto1 ADC MIXR ADC2 Switch' on"
 	]
 
 	DisableSequence [
-		cdev "hw:chtrt5650"
-
 		cset "name='Sto1 ADC MIXL ADC2 Switch' off"
 		cset "name='Sto1 ADC MIXR ADC2 Switch' off"
 		cset "name='Int Mic Switch' off"
@@ -116,16 +100,12 @@ SectionDevice."HSMic".0 {
 	}
 
 	EnableSequence [
-		cdev "hw:chtrt5650"
-
 		<codecs/rt5645/HSMicEnableSeq.conf>
 
 		cset "name='IN1 Boost' 1"
 	]
 
 	DisableSequence [
-		cdev "hw:chtrt5650"
-
 		<codecs/rt5645/HSMicDisableSeq.conf>
 
 		cset "name='IN1 Boost' 0"
diff --git a/ucm/chtrt5650/chtrt5650.conf b/ucm2/chtrt5650/chtrt5650.conf
similarity index 100%
rename from ucm/chtrt5650/chtrt5650.conf
rename to ucm2/chtrt5650/chtrt5650.conf
-- 
2.47.1