skylake-rt286: adapt more to ucm2

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

diff --git a/ucm2/skylake-rt286/HiFi.conf b/ucm2/skylake-rt286/HiFi.conf
index 41638f4cb9c886b879becd856e736e980824c70a..489170f33acf8808c3435dc25917e4f218053d34 100644 (file)
--- a/ucm2/skylake-rt286/HiFi.conf
+++ b/ucm2/skylake-rt286/HiFi.conf
@@ -4,18 +4,13 @@
 SectionVerb {
 
        EnableSequence [
-               cdev "hw:skylakert286"
                cset "name='media0_out mo dmic01_hifi_in mi Switch' 1"
        ]
 
-       DisableSequence [
-               cdev "hw:skylakert286"
-       ]
-
        Value {
                TQ "HiFi"
-               CapturePCM "hw:skylakert286,1"
-               PlaybackPCM "hw:skylakert286,0"
+               CapturePCM "hw:${CardId},1"
+               PlaybackPCM "hw:${CardId},0"
        }
 }
 
@@ -26,7 +21,6 @@ SectionDevice."Headphones" {
                "Speaker"
        ]
        EnableSequence [
-               cdev "hw:skylakert286"
                cset "name='HPO L Switch' 1"
                cset "name='HPO R Switch' 1"
                cset "name='Headphone Jack Switch' 1"
@@ -50,7 +44,6 @@ SectionDevice."Speaker" {
                "Headphones"
        ]
        EnableSequence [
-               cdev "hw:skylakert286"
                cset "name='SPO Switch' 1"
                cset "name='Speaker Playback Switch' 1,1"
                cset "name='Speaker Switch' 1"
@@ -74,7 +67,6 @@ SectionDevice."Headset" {
                "dmiccap"
        ]
        EnableSequence [
-               cdev "hw:skylakert286"
                cset "name='media0_out mo codec0_in mi Switch' 1"
                cset "name='ADC0 Capture Switch' 1,1"
                cset "name='ADC 0 Mux' 0"
@@ -83,7 +75,6 @@ SectionDevice."Headset" {
        ]
 
        DisableSequence [
-               cdev "hw:skylakert286"
                cset "name='media0_out mo dmic01_hifi_in mi Switch' 1"
                cset "name='media0_out mo codec0_in mi Switch' 0"
        ]
@@ -99,12 +90,10 @@ SectionDevice."dmiccap" {
        Comment "DMIC Stereo"
 
        ConflictingDevice [
-               "Headpset"
+               "Headset"
        ]
 
        EnableSequence [
-
-               cdev "hw:skylakert286"
                cset "name='media0_out mo dmic01_hifi_in mi Switch' 1"
                cset "name='media0_out mo codec0_in mi Switch' 0"
                cset "name='ADC0 Capture Switch' 0,0"
@@ -114,7 +103,6 @@ SectionDevice."dmiccap" {
        ]
 
        DisableSequence [
-               cdev "hw:skylakert286"
                cset "name='media0_out mo codec0_in mi Switch' 1"
                cset "name='media0_out mo dmic01_hifi_in mi Switch' 0"
                cset "name='ADC0 Capture Switch' 1,1"

diff --git a/ucm2/skylake-rt286/skylake-rt286.conf b/ucm2/skylake-rt286/skylake-rt286.conf
index f07defb7031bc4c76c07eeb4d81f8f63dd174ca9..efb8a20e0533fb13d3a9bb6dad1fa5d90568c91a 100644 (file)
--- a/ucm2/skylake-rt286/skylake-rt286.conf
+++ b/ucm2/skylake-rt286/skylake-rt286.conf
@@ -19,8 +19,6 @@ SectionUseCase."Hdmi2" {
 }
 
 ValueDefaults {
-       PlaybackCTL "hw:skylakert286"
-       CaptureCTL "hw:skylakert286"
        CaptureChannels "2"
        CapturePriority "2"     
 }