From 0032be1b553b7f58dd8b53403318a21d0f810b65 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 11 Nov 2019 12:55:53 +0100 Subject: [PATCH] VEYRON-I2S: adapt to ucm2 Signed-off-by: Jaroslav Kysela --- {ucm => ucm2}/VEYRON-I2S/HiFi.conf | 33 ++++++------------------ {ucm => ucm2}/VEYRON-I2S/VEYRON-I2S.conf | 2 ++ 2 files changed, 10 insertions(+), 25 deletions(-) rename {ucm => ucm2}/VEYRON-I2S/HiFi.conf (87%) rename {ucm => ucm2}/VEYRON-I2S/VEYRON-I2S.conf (90%) diff --git a/ucm/VEYRON-I2S/HiFi.conf b/ucm2/VEYRON-I2S/HiFi.conf similarity index 87% rename from ucm/VEYRON-I2S/HiFi.conf rename to ucm2/VEYRON-I2S/HiFi.conf index 6dddf9a..be2137b 100644 --- a/ucm/VEYRON-I2S/HiFi.conf +++ b/ucm2/VEYRON-I2S/HiFi.conf @@ -5,8 +5,6 @@ SectionVerb { } EnableSequence [ - cdev "hw:VEYRONI2S" - cset "name='Left Speaker Mixer Left DAC Switch' on" cset "name='Right Speaker Mixer Right DAC Switch' on" cset "name='Headphone Left Switch' off" @@ -42,63 +40,51 @@ SectionVerb { cset "name='Speaker Right Switch' on" cset "name='Speaker Switch' on" ] - - DisableSequence [ - ] } SectionDevice."Speaker".0 { Comment "Speaker" + Value { - PlaybackPCM "hw:VEYRONI2S,0" + PlaybackPCM "hw:${CardId},0" } EnableSequence [ - cdev "hw:VEYRONI2S" - cset "name='Speaker Switch' on" ] DisableSequence [ - cdev "hw:VEYRONI2S" - cset "name='Speaker Switch' off" ] } SectionDevice."Internal Mic".0 { Comment "Int Mic" + Value { - CapturePCM "hw:VEYRONI2S,0" + CapturePCM "hw:${CardId},0" } EnableSequence [ - cdev "hw:VEYRONI2S" - cset "name='Int Mic Switch' on" ] DisableSequence [ - cdev "hw:VEYRONI2S" - cset "name='Int Mic Switch' off" ] } SectionDevice."Headphone".0 { Comment "Headphone" + Value { JackName "VEYRON-I2S Headset Jack" - PlaybackPCM "hw:VEYRONI2S,0" + PlaybackPCM "hw:${CardId},0" OutputDspName "" } EnableSequence [ - cdev "hw:VEYRONI2S" - cset "name='Speaker Switch' off" cset "name='Headphone Left Switch' on" cset "name='Headphone Right Switch' on" ] DisableSequence [ - cdev "hw:VEYRONI2S" - cset "name='Headphone Left Switch' off" cset "name='Headphone Right Switch' off" cset "name='Speaker Switch' on" @@ -107,14 +93,13 @@ SectionDevice."Headphone".0 { SectionDevice."Mic".0 { Comment "Headset Mic" + Value { JackName "VEYRON-I2S Headset Jack" - CapturePCM "hw:VEYRONI2S,0" + CapturePCM "hw:${CardId},0" } EnableSequence [ - cdev "hw:VEYRONI2S" - cset "name='Int Mic Switch' off" cset "name='DMIC Mux' ADC" cset "name='Headset Mic Switch' on" @@ -122,8 +107,6 @@ SectionDevice."Mic".0 { ] DisableSequence [ - cdev "hw:VEYRONI2S" - cset "name='Headset Mic Switch' off" cset "name='DMIC Mux' DMIC" cset "name='Int Mic Switch' on" diff --git a/ucm/VEYRON-I2S/VEYRON-I2S.conf b/ucm2/VEYRON-I2S/VEYRON-I2S.conf similarity index 90% rename from ucm/VEYRON-I2S/VEYRON-I2S.conf rename to ucm2/VEYRON-I2S/VEYRON-I2S.conf index 2a92b6f..670f15b 100644 --- a/ucm/VEYRON-I2S/VEYRON-I2S.conf +++ b/ucm2/VEYRON-I2S/VEYRON-I2S.conf @@ -1,3 +1,5 @@ +Syntax 2 + Comment "Rockchip Veyron card" SectionUseCase."HiFi" { -- 2.47.1