From 4ca0ece000d17d5a6b3e5ff89c2d8fc0f24bfd36 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 13 Apr 2020 10:53:39 -0500 Subject: [PATCH] sof-bytcht-rt5650: reuse legacy settings Just test if controls for the legacy driver are available Signed-off-by: Pierre-Louis Bossart Signed-off-by: Jaroslav Kysela --- ucm2/chtrt5650/HiFi.conf | 51 ++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/ucm2/chtrt5650/HiFi.conf b/ucm2/chtrt5650/HiFi.conf index b365bc6..2342e85 100644 --- a/ucm2/chtrt5650/HiFi.conf +++ b/ucm2/chtrt5650/HiFi.conf @@ -5,20 +5,45 @@ SectionVerb { TQ "HiFi" } - EnableSequence [ - - - - cset "name='Speaker HWEQ' 1,164,237,135,1,165,0,0,1,166,237,135,1,167,0,0,1,192,30,196,1,193,0,0,1,194,30,196,1,195,0,0,1,196,31,180,1,197,0,75,1,198,31,180,1,199,31,180,1,200,0,75,1,201,31,180,0,177,51,224" - cset "name='DAC1 Playback Volume' 77,77" - cset "name='Speaker ClassD Playback Volume' 4" - cset "name='I2S2 Func Switch' off" - cset "name='RT5650 IF1 ADC Mux' 0" - ] + If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + True { + EnableSequence [ + + + + cset "name='Speaker HWEQ' 1,164,237,135,1,165,0,0,1,166,237,135,1,167,0,0,1,192,30,196,1,193,0,0,1,194,30,196,1,195,0,0,1,196,31,180,1,197,0,75,1,198,31,180,1,199,31,180,1,200,0,75,1,201,31,180,0,177,51,224" + cset "name='DAC1 Playback Volume' 77,77" + cset "name='Speaker ClassD Playback Volume' 4" + cset "name='I2S2 Func Switch' off" + cset "name='RT5650 IF1 ADC Mux' 0" + ] + + DisableSequence [ + + + ] + } + False { + EnableSequence [ + + + cset "name='Speaker HWEQ' 1,164,237,135,1,165,0,0,1,166,237,135,1,167,0,0,1,192,30,196,1,193,0,0,1,194,30,196,1,195,0,0,1,196,31,180,1,197,0,75,1,198,31,180,1,199,31,180,1,200,0,75,1,201,31,180,0,177,51,224" + cset "name='DAC1 Playback Volume' 77,77" + cset "name='Speaker ClassD Playback Volume' 4" + cset "name='I2S2 Func Switch' off" + cset "name='RT5650 IF1 ADC Mux' 0" + ] + + DisableSequence [ + + ] + } + } - DisableSequence [ - - ] } SectionDevice."Speaker" { -- 2.47.1