From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 20 Nov 2019 19:58:24 +0000 (+0100)
Subject: kblrt5660: adapt to ucm2
X-Git-Tag: v1.2.1.2~23
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=bad8e8af79704ad44ea2fdc660e201636b5a149a;p=alsa-ucm-conf.git

kblrt5660: adapt to ucm2

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

diff --git a/ucm/kblrt5660/Hdmi1.conf b/ucm2/kblrt5660/Hdmi1.conf
similarity index 73%
rename from ucm/kblrt5660/Hdmi1.conf
rename to ucm2/kblrt5660/Hdmi1.conf
index 95e6187..b6adbaa 100755
--- a/ucm/kblrt5660/Hdmi1.conf
+++ b/ucm2/kblrt5660/Hdmi1.conf
@@ -4,14 +4,8 @@
 SectionDevice."Hdmi1" {
         Comment "HDMI/Display Port 1 Stereo"
 
-        EnableSequence [
-        ]
-
-        DisableSequence [
-        ]
-
         Value {
-                PlaybackPCM "hw:kblrt5660,2"
+                PlaybackPCM "hw:${CardId},2"
                 PlaybackChannels "2"
                 PlaybackPriority "2"
                 JackControl "HDMI/DP, pcm=4 Jack"
diff --git a/ucm/kblrt5660/Hdmi2.conf b/ucm2/kblrt5660/Hdmi2.conf
similarity index 73%
rename from ucm/kblrt5660/Hdmi2.conf
rename to ucm2/kblrt5660/Hdmi2.conf
index f6d2fee..19e9bd0 100755
--- a/ucm/kblrt5660/Hdmi2.conf
+++ b/ucm2/kblrt5660/Hdmi2.conf
@@ -4,14 +4,8 @@
 SectionDevice."Hdmi2" {
         Comment "HDMI/Display Port 2 Stereo"
 
-        EnableSequence [
-        ]
-
-        DisableSequence [
-        ]
-
         Value {
-                PlaybackPCM "hw:kblrt5660,3"
+                PlaybackPCM "hw:${CardId},3"
                 PlaybackChannels "2"
                 PlaybackPriority "3"
                 JackControl "HDMI/DP, pcm=5 Jack"
diff --git a/ucm/kblrt5660/HiFi.conf b/ucm2/kblrt5660/HiFi.conf
similarity index 90%
rename from ucm/kblrt5660/HiFi.conf
rename to ucm2/kblrt5660/HiFi.conf
index dbdb900..af0d805 100755
--- a/ucm/kblrt5660/HiFi.conf
+++ b/ucm2/kblrt5660/HiFi.conf
@@ -3,17 +3,11 @@
 
 SectionVerb {
 
-	EnableSequence [
-	]
-
-	DisableSequence [
-	]
-
 	# ALSA PCM
 	Value {
 		# ALSA PCM device for HiFi
-		PlaybackPCM "hw:kblrt5660,0"
-		CapturePCM "hw:kblrt5660,1"
+		PlaybackPCM "hw:${CardId},0"
+		CapturePCM "hw:${CardId},1"
 	}
 }
 
@@ -21,7 +15,6 @@ SectionDevice."LineOut" {
 	Comment "LineOut playback"
 
 	EnableSequence [
-		cdev "hw:kblrt5660"
 		cset "name='DAC1 Playback Volume' 30"
 		cset "name='OUT Playback Volume' 19"
 		cset "name='OUT Playback Switch' on"
@@ -37,7 +30,6 @@ SectionDevice."LineOut" {
 	]
 
 	DisableSequence [
-		cdev "hw:kblrt5660"
 		cset "name='Line Out Switch' off"
 		cset "name='DAC1 MIXL DAC1' off"
 		cset "name='DAC1 MIXR DAC1' off"
@@ -54,8 +46,6 @@ SectionDevice."LineIn" {
 	Comment "LineIn capture"
 
 	EnableSequence [
-		cdev "hw:kblrt5660"
-
 		cset "name='ADC Capture Volume' 30"
 		cset "name='IN1 Boost Volume' 30"
 		cset "name='IN2 Boost Volume' 30"
@@ -71,7 +61,6 @@ SectionDevice."LineIn" {
 	]
 
 	DisableSequence [
-		cdev "hw:kblrt5660"
 		cset "name='Line In Switch' off"
 		cset "name='Sto1 ADC MIXR ADC1 Switch' off"
 		cset "name='Sto1 ADC MIXL ADC1 Switch' off"
diff --git a/ucm/kblrt5660/kblrt5660.conf b/ucm2/kblrt5660/kblrt5660.conf
similarity index 86%
rename from ucm/kblrt5660/kblrt5660.conf
rename to ucm2/kblrt5660/kblrt5660.conf
index 04c4f57..124fb88 100755
--- a/ucm/kblrt5660/kblrt5660.conf
+++ b/ucm2/kblrt5660/kblrt5660.conf
@@ -1,3 +1,5 @@
+Syntax 2
+
 SectionUseCase."HiFi" {
 	File "HiFi.conf"
 	Comment "Play HiFi quality Music"
@@ -12,7 +14,3 @@ SectionUseCase."Hdmi2" {
         File "Hdmi2.conf"
         Comment "Play on Hdmi/DP 2"
 }
-
-SectionDefaults [
-	cdev "hw:kblrt5660"
-]