From 974772e80f74a9f1c394eeae22cb80731b44b927 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 21 Nov 2019 14:57:19 +0100 Subject: [PATCH] skylake-rt286: adapt more to ucm2 Signed-off-by: Jaroslav Kysela --- ucm2/skylake-rt286/HiFi.conf | 18 +++--------------- ucm2/skylake-rt286/skylake-rt286.conf | 2 -- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/ucm2/skylake-rt286/HiFi.conf b/ucm2/skylake-rt286/HiFi.conf index 41638f4..489170f 100644 --- 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 f07defb..efb8a20 100644 --- 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" } -- 2.47.3