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 95e6187a3b07e40256607c7d5899bb0184dafef8..b6adbaa834dca4da80709d4eed80bb7241d74a31 100755 (executable)
--- 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 f6d2feee7709a7c0904193e4c601485fc40eb1da..19e9bd0b300ba8fad2ec76252fc27f67df70a6ef 100755 (executable)
--- 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 dbdb90061d94dc700b97d44381e6ef28a58154f2..af0d805a3aa75eb6449e46f37a543c687e1be58c 100755 (executable)
--- 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 04c4f57b6bd3fb54a031ca56cea348a546794dcb..124fb883336492921d4b1cfcd7b16f8bffdb9eb5 100755 (executable)
--- 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"
-]