From d09c450b77c1ac68c64b6e0ef3db6a5b0bce91f9 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 10 Nov 2019 20:56:23 +0100 Subject: [PATCH] DAISY-I2S: adapt to ucm2 Signed-off-by: Jaroslav Kysela --- {ucm => ucm2}/DAISY-I2S/DAISY-I2S.conf | 2 ++ {ucm => ucm2}/DAISY-I2S/HiFi.conf | 14 +++----------- 2 files changed, 5 insertions(+), 11 deletions(-) rename {ucm => ucm2}/DAISY-I2S/DAISY-I2S.conf (90%) rename {ucm => ucm2}/DAISY-I2S/HiFi.conf (88%) diff --git a/ucm/DAISY-I2S/DAISY-I2S.conf b/ucm2/DAISY-I2S/DAISY-I2S.conf similarity index 90% rename from ucm/DAISY-I2S/DAISY-I2S.conf rename to ucm2/DAISY-I2S/DAISY-I2S.conf index 0f4b5fc..040db63 100644 --- a/ucm/DAISY-I2S/DAISY-I2S.conf +++ b/ucm2/DAISY-I2S/DAISY-I2S.conf @@ -1,3 +1,5 @@ +Syntax 2 + Comment "Daisy internal card" SectionUseCase."HiFi" { diff --git a/ucm/DAISY-I2S/HiFi.conf b/ucm2/DAISY-I2S/HiFi.conf similarity index 88% rename from ucm/DAISY-I2S/HiFi.conf rename to ucm2/DAISY-I2S/HiFi.conf index d8c06ad..373c345 100644 --- a/ucm/DAISY-I2S/HiFi.conf +++ b/ucm2/DAISY-I2S/HiFi.conf @@ -1,6 +1,5 @@ SectionVerb { EnableSequence [ - cdev "hw:DAISYI2S" cset "name='Left Speaker Mixer Left DAC1 Switch' on" cset "name='Right Speaker Mixer Right DAC1 Switch' on" cset "name='Left Headphone Mixer Left DAC1 Switch' on" @@ -13,23 +12,20 @@ SectionVerb { cset "name='EQ1 Mode' Default" cset "name='DAI1 Filter Mode' Music" ] - DisableSequence [ - ] } -SectionDevice."Headphone".0 { +SectionDevice."Headphone" { Value { JackName "DAISY-I2S Headphone Jack" } EnableSequence [ - cdev "hw:DAISYI2S" cset "name='EQ1 Switch' off" cset "name='Left Headphone Mixer Left DAC1 Switch' on" cset "name='Right Headphone Mixer Right DAC1 Switch' on" ] + DisableSequence [ - cdev "hw:DAISYI2S" cset "name='EQ1 Mode' Default" cset "name='EQ1 Switch' on" cset "name='Left Speaker Mixer Left DAC1 Switch' on" @@ -37,14 +33,12 @@ SectionDevice."Headphone".0 { ] } -SectionDevice."Mic".0 { +SectionDevice."Mic" { Value { JackName "DAISY-I2S Mic Jack" } EnableSequence [ - cdev "hw:DAISYI2S" - cset "name='DMIC1 Left Capture Switch' off" cset "name='DMIC1 Right Capture Switch' off" cset "name='Left ADC Mixer MIC2 Switch' on" @@ -52,8 +46,6 @@ SectionDevice."Mic".0 { ] DisableSequence [ - cdev "hw:DAISYI2S" - cset "name='Left ADC Mixer MIC2 Switch' off" cset "name='Right ADC Mixer MIC2 Switch' off" cset "name='DMIC1 Left Capture Switch' on" -- 2.47.1