From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 10 Nov 2019 19:23:30 +0000 (+0100)
Subject: broadwell-rt286: adapt to ucm2
X-Git-Tag: v1.2.1~16
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=dd96b698b0c6e062feb38be0f4a75715bf13f68c;p=alsa-ucm-conf.git

broadwell-rt286: adapt to ucm2

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

diff --git a/ucm/broadwell-rt286/HiFi.conf b/ucm2/broadwell-rt286/HiFi.conf
similarity index 86%
rename from ucm/broadwell-rt286/HiFi.conf
rename to ucm2/broadwell-rt286/HiFi.conf
index c09a01c..6cf31e7 100644
--- a/ucm/broadwell-rt286/HiFi.conf
+++ b/ucm2/broadwell-rt286/HiFi.conf
@@ -3,17 +3,11 @@
 
 SectionVerb {
 
-	EnableSequence [
-	]
-
-	DisableSequence [
-	]
-
 	# ALSA PCM
 	Value {
 		# ALSA PCM device for HiFi
-		PlaybackPCM "hw:broadwellrt286"
-		CapturePCM "hw:broadwellrt286"
+		PlaybackPCM "hw:${CardId}"
+		CapturePCM "hw:${CardId}"
 	}
 }
 
@@ -25,7 +19,6 @@ SectionDevice."Headphones" {
 	]
 
 	EnableSequence [
-		cdev "hw:broadwellrt286"
 		cset "name='Master Playback Volume' 30"
 		cset "name='HPO L Switch' on"
 		cset "name='HPO R Switch' on"
@@ -34,7 +27,6 @@ SectionDevice."Headphones" {
 	]
 
 	DisableSequence [
-		cdev "hw:broadwellrt286"
 		cset "name='Headphone Jack Switch' off"
 		cset "name='HPO L Switch' off"
 		cset "name='HPO R Switch' off"
@@ -56,7 +48,6 @@ SectionDevice."Speaker" {
 	]
 
 	EnableSequence [
-		cdev "hw:broadwellrt286"
 		cset "name='Master Playback Volume' 30"
 		cset "name='DAC0 Playback Volume' 127"
 		cset "name='SPO Switch' on"
@@ -65,7 +56,6 @@ SectionDevice."Speaker" {
 	]
 
 	DisableSequence [
-		cdev "hw:broadwellrt286"
 		cset "name='Speaker Switch' off"
 		cset "name='Speaker Playback Switch' off"
 		cset "name='SPO Switch' 0"
@@ -84,8 +74,6 @@ SectionDevice."Handset" {
 	]
 
 	EnableSequence [
-		cdev "hw:broadwellrt286"
-
 		cset "name='Mic Capture Volume' 28"
 		cset "name='ADC 0 Mux' 0"
 		cset "name='ADC0 Capture Switch' on"
@@ -94,7 +82,6 @@ SectionDevice."Handset" {
 	]
 
 	DisableSequence [
-		cdev "hw:broadwellrt286"
 		cset "name='ADC0 Capture Switch' off"
 	]
 
@@ -114,8 +101,6 @@ SectionDevice."Mainmic" {
 	]
 
 	EnableSequence [
-		cdev "hw:broadwellrt286"
-
 		cset "name='Mic Capture Volume' 30"
 		cset "name='ADC 0 Mux' 2"
 		cset "name='ADC0 Capture Switch' on"
@@ -123,7 +108,6 @@ SectionDevice."Mainmic" {
 	]
 
 	DisableSequence [
-		cdev "hw:broadwellrt286"
 		cset "name='ADC0 Capture Switch' off"
 	]
 
diff --git a/ucm/broadwell-rt286/broadwell-rt286.conf b/ucm2/broadwell-rt286/broadwell-rt286.conf
similarity index 63%
rename from ucm/broadwell-rt286/broadwell-rt286.conf
rename to ucm2/broadwell-rt286/broadwell-rt286.conf
index 1ee1824..d7a0518 100644
--- a/ucm/broadwell-rt286/broadwell-rt286.conf
+++ b/ucm2/broadwell-rt286/broadwell-rt286.conf
@@ -1,8 +1,6 @@
+Syntax 2
+
 SectionUseCase."HiFi" {
 	File "HiFi.conf"
 	Comment "Play HiFi quality Music"
 }
-
-SectionDefaults [
-	cdev "hw:broadwellrt286"
-]