From 726eff328bf5b6224f7ae3121e45b2363a4285ee Mon Sep 17 00:00:00 2001 From: WeirdTreeThing Date: Sun, 26 Nov 2023 12:31:50 -0500 Subject: [PATCH] stuff --- apl/sof-bxtda7219ma/HiFi.conf | 24 ---------- apl/sof-bxtda7219ma/sof-bxtda7219ma.conf | 4 +- cezanne/sof-rt5682s-rt1/HiFi.conf | 43 ------------------ cezanne/sof-rt5682s-rt1/sof-rt5682s-rt1.conf | 5 ++- cml/sof-cml_rt1011_/HiFi.conf | 3 -- cml/sof-cml_rt1011_/sof-cml_rt1011_.conf | 5 ++- glk/sof-glkda7219ma/sof-glkda7219ma.conf | 2 - glk/sof-glkrt5682ma/sof-glkrt5682ma.conf | 4 +- jsl/sof-da7219max98/HiFi.conf | 25 ----------- jsl/sof-da7219max98/sof-da7219max98.conf | 4 +- mendocino/sof-rt5682s-hs-/HiFi.conf | 45 ------------------- .../sof-rt5682s-hs-/sof-rt5682s-hs-.conf | 5 ++- stoney/acpd7219m98357/HiFi.conf | 24 ---------- stoney/acpd7219m98357/acpd7219m98357.conf | 4 +- 14 files changed, 17 insertions(+), 180 deletions(-) diff --git a/apl/sof-bxtda7219ma/HiFi.conf b/apl/sof-bxtda7219ma/HiFi.conf index 3c39c42..570237b 100644 --- a/apl/sof-bxtda7219ma/HiFi.conf +++ b/apl/sof-bxtda7219ma/HiFi.conf @@ -1,27 +1,3 @@ -SectionVerb { - EnableSequence [ - cset "name='Playback Digital Volume' 111" - cset "name='Playback Digital Switch' 1" - cset "name='Out DACL Mux' DAIL" - cset "name='Out DACR Mux' DAIR" - cset "name='Mixer Out FilterL DACL Switch' 1" - cset "name='Mixer Out FilterR DACR Switch' 1" - cset "name='ST Mixer Out FilterL Out FilterL Switch' 1" - cset "name='ST Mixer Out FilterR Out FilterR Switch' 1" - cset "name='Headphone Jack Switch' off" - cset "name='Headset Mic Switch' off" - cset "name='Mic Volume' 5" - cset "name='Capture Digital Volume' 111" - cset "name='Capture Digital Switch' 1" - cset "name='Mixin Volume' 10" - cset "name='Mixin Switch' 1" - cset "name='Mixer In Mic Switch' 1" - cset "name='Out DAIL Mux' ADC" - cset "name='Out DAIR Mux' ADC" - cset "name='Gain Ramp Rate' 1" - ] -} - SectionDevice."Speaker" { Comment "Speaker" diff --git a/apl/sof-bxtda7219ma/sof-bxtda7219ma.conf b/apl/sof-bxtda7219ma/sof-bxtda7219ma.conf index 314c435..14126dd 100644 --- a/apl/sof-bxtda7219ma/sof-bxtda7219ma.conf +++ b/apl/sof-bxtda7219ma/sof-bxtda7219ma.conf @@ -1,8 +1,8 @@ Syntax 6 -Comment "sof-bxtda7219max internal card" - SectionUseCase."HiFi" { File "HiFi.conf" Comment "Default" } + +Include.codec-init.File "/codecs/da7219/init.conf" diff --git a/cezanne/sof-rt5682s-rt1/HiFi.conf b/cezanne/sof-rt5682s-rt1/HiFi.conf index 9d820fe..c837625 100644 --- a/cezanne/sof-rt5682s-rt1/HiFi.conf +++ b/cezanne/sof-rt5682s-rt1/HiFi.conf @@ -1,46 +1,3 @@ -SectionVerb { - EnableSequence [ - cset "name='ADCDAT Mux' 0" - cset "name='CBJ Boost Volume' 13" - cset "name='DAC L1 Source' 1" - cset "name='DAC R1 Source' 1" - cset "name='DAC1 MIXL DAC1 Switch' 1" - cset "name='DAC1 MIXL Stereo ADC Switch' 0" - cset "name='DAC1 MIXR DAC1 Switch' 1" - cset "name='DAC1 MIXR Stereo ADC Switch' 0" - cset "name='DAC1 Playback Volume' 100" - cset "name='Headset Mic Switch' 0" - cset "name='IF1 01 ADC Swap Mux' 2" - cset "name='IF1 23 ADC Swap Mux' 0" - cset "name='IF1 45 ADC Swap Mux' 0" - cset "name='IF1 67 ADC Swap Mux' 0" - cset "name='IF1_ADC Mux' 0" - cset "name='IF2 ADC Swap Mux' 0" - cset "name='Left DAC Playback Volume' 127" - cset "name='Left Mono LR Select' 0" - cset "name='RECMIX1L CBJ Switch' 1" - cset "name='Right DAC Playback Volume' 127" - cset "name='Right Mono LR Select' 1" - cset "name='STO1 ADC Boost Gain Volume' 0" - cset "name='STO1 ADC Capture Switch' 2" - cset "name='STO1 ADC Capture Volume' 50" - cset "name='Stereo1 ADC L Mux' 0" - cset "name='Stereo1 ADC L1 Mux' 1" - cset "name='Stereo1 ADC L2 Mux' 0" - cset "name='Stereo1 ADC MIXL ADC1 Switch' 1" - cset "name='Stereo1 ADC MIXL ADC2 Switch' 0" - cset "name='Stereo1 ADC MIXR ADC1 Switch' 1" - cset "name='Stereo1 ADC MIXR ADC2 Switch' 0" - cset "name='Stereo1 ADC R Mux' 1" - cset "name='Stereo1 ADC R1 Mux' 1" - cset "name='Stereo1 ADC R2 Mux' 0" - cset "name='Left Spk Switch' 0" - cset "name='Right Spk Switch' 0" - cset "name='Headphone Jack Switch' off" - cset "name='Headset Mic Switch' off" - ] -} - SectionDevice."Speaker" { Comment "Speaker" diff --git a/cezanne/sof-rt5682s-rt1/sof-rt5682s-rt1.conf b/cezanne/sof-rt5682s-rt1/sof-rt5682s-rt1.conf index 63f8162..4fffece 100644 --- a/cezanne/sof-rt5682s-rt1/sof-rt5682s-rt1.conf +++ b/cezanne/sof-rt5682s-rt1/sof-rt5682s-rt1.conf @@ -1,8 +1,9 @@ Syntax 6 -Comment "Guybrush SOF internal card for ALC5682I-VS and ALC1019" - SectionUseCase."HiFi" { File "HiFi.conf" Comment "Default" } + +Include.codec-init.File "/codecs/rt5682s/init.conf" +Include.speaker-init.File "/codecs/rt1019/init.conf" diff --git a/cml/sof-cml_rt1011_/HiFi.conf b/cml/sof-cml_rt1011_/HiFi.conf index fd9e117..095e282 100644 --- a/cml/sof-cml_rt1011_/HiFi.conf +++ b/cml/sof-cml_rt1011_/HiFi.conf @@ -1,6 +1,3 @@ -SectionVerb { -} - SectionDevice."Speaker" { Comment "Speaker" diff --git a/cml/sof-cml_rt1011_/sof-cml_rt1011_.conf b/cml/sof-cml_rt1011_/sof-cml_rt1011_.conf index 7a43f96..6f91b4f 100644 --- a/cml/sof-cml_rt1011_/sof-cml_rt1011_.conf +++ b/cml/sof-cml_rt1011_/sof-cml_rt1011_.conf @@ -1,8 +1,9 @@ Syntax 6 -Comment "sof-cmlrt1011rt5682 internal card" - SectionUseCase."HiFi" { File "HiFi.conf" Comment "Default" } + +Include.codec-init.File "/conf.d/sof-rt5682/rt5682-init.conf" +Include.speaker-init.File "/codecs/rt1011/init.conf" diff --git a/glk/sof-glkda7219ma/sof-glkda7219ma.conf b/glk/sof-glkda7219ma/sof-glkda7219ma.conf index b35b414..14126dd 100644 --- a/glk/sof-glkda7219ma/sof-glkda7219ma.conf +++ b/glk/sof-glkda7219ma/sof-glkda7219ma.conf @@ -1,7 +1,5 @@ Syntax 6 -Comment "sof-glkda7219max internal card" - SectionUseCase."HiFi" { File "HiFi.conf" Comment "Default" diff --git a/glk/sof-glkrt5682ma/sof-glkrt5682ma.conf b/glk/sof-glkrt5682ma/sof-glkrt5682ma.conf index 6a91c19..7eb2e68 100644 --- a/glk/sof-glkrt5682ma/sof-glkrt5682ma.conf +++ b/glk/sof-glkrt5682ma/sof-glkrt5682ma.conf @@ -1,8 +1,8 @@ Syntax 6 -Comment "Geminilake internal card" - SectionUseCase."HiFi" { File "HiFi.conf" Comment "Default" } + +Include.codec-init.File "/conf.d/sof-rt5682/rt5682-init.conf" diff --git a/jsl/sof-da7219max98/HiFi.conf b/jsl/sof-da7219max98/HiFi.conf index 47296b9..784103c 100644 --- a/jsl/sof-da7219max98/HiFi.conf +++ b/jsl/sof-da7219max98/HiFi.conf @@ -1,28 +1,3 @@ -SectionVerb { - EnableSequence [ - cset "name='Playback Digital Volume' 103" - cset "name='Playback Digital Switch' 1" - cset "name='Headphone Volume' 57" - cset "name='Out DACL Mux' DAIL" - cset "name='Out DACR Mux' DAIR" - cset "name='Mixer Out FilterL DACL Switch' 1" - cset "name='Mixer Out FilterR DACR Switch' 1" - cset "name='ST Mixer Out FilterL Out FilterL Switch' 1" - cset "name='ST Mixer Out FilterR Out FilterR Switch' 1" - cset "name='Headphone Jack Switch' off" - cset "name='Headset Mic Switch' off" - cset "name='Mic Volume' 2" - cset "name='Capture Digital Volume' 111" - cset "name='Capture Digital Switch' 1" - cset "name='Mixin Volume' 10" - cset "name='Mixin Switch' 1" - cset "name='Mixer In Mic Switch' 1" - cset "name='Out DAIL Mux' ADC" - cset "name='Out DAIR Mux' ADC" - cset "name='Gain Ramp Rate' 1" - ] -} - SectionDevice."Speaker" { Comment "Speaker" diff --git a/jsl/sof-da7219max98/sof-da7219max98.conf b/jsl/sof-da7219max98/sof-da7219max98.conf index 730701b..14126dd 100644 --- a/jsl/sof-da7219max98/sof-da7219max98.conf +++ b/jsl/sof-da7219max98/sof-da7219max98.conf @@ -1,8 +1,8 @@ Syntax 6 -Comment "sof-da7219max98360a internal card" - SectionUseCase."HiFi" { File "HiFi.conf" Comment "Default" } + +Include.codec-init.File "/codecs/da7219/init.conf" diff --git a/mendocino/sof-rt5682s-hs-/HiFi.conf b/mendocino/sof-rt5682s-hs-/HiFi.conf index 9fd413b..10f407f 100644 --- a/mendocino/sof-rt5682s-hs-/HiFi.conf +++ b/mendocino/sof-rt5682s-hs-/HiFi.conf @@ -1,48 +1,3 @@ -SectionVerb { - EnableSequence [ - # Speaker - cset "name='Left Spk Switch' off" - cset "name='Right Spk Switch' off" - - # Headphone - cset "name='ADCDAT Mux' 0" - cset "name='CBJ Boost Volume' 13" - cset "name='DAC L1 Source' 1" - cset "name='DAC R1 Source' 1" - cset "name='DAC1 MIXL DAC1 Switch' 1" - cset "name='DAC1 MIXL Stereo ADC Switch' 0" - cset "name='DAC1 MIXR DAC1 Switch' 1" - cset "name='DAC1 MIXR Stereo ADC Switch' 0" - cset "name='DAC1 Playback Volume' 100" - cset "name='IF1 01 ADC Swap Mux' 2" - cset "name='IF1 23 ADC Swap Mux' 0" - cset "name='IF1 45 ADC Swap Mux' 0" - cset "name='IF1 67 ADC Swap Mux' 0" - cset "name='IF1_ADC Mux' 0" - cset "name='IF2 ADC Swap Mux' 0" - cset "name='Left DAC Playback Volume' 127" - cset "name='Left Mono LR Select' 0" - cset "name='RECMIX1L CBJ Switch' 1" - cset "name='Right DAC Playback Volume' 127" - cset "name='Right Mono LR Select' 1" - cset "name='STO1 ADC Boost Gain Volume' 0" - cset "name='STO1 ADC Capture Switch' 2" - cset "name='STO1 ADC Capture Volume' 50" - cset "name='Stereo1 ADC L Mux' 0" - cset "name='Stereo1 ADC L1 Mux' 1" - cset "name='Stereo1 ADC L2 Mux' 0" - cset "name='Stereo1 ADC MIXL ADC1 Switch' 1" - cset "name='Stereo1 ADC MIXL ADC2 Switch' 0" - cset "name='Stereo1 ADC MIXR ADC1 Switch' 1" - cset "name='Stereo1 ADC MIXR ADC2 Switch' 0" - cset "name='Stereo1 ADC R Mux' 1" - cset "name='Stereo1 ADC R1 Mux' 1" - cset "name='Stereo1 ADC R2 Mux' 0" - cset "name='Headphone Jack Switch' off" - cset "name='Headset Mic Switch' off" - ] -} - # Split 4ch dmic into 2 virtual 2ch mics Include.pcm_split.File "/common/pcm/split.conf" diff --git a/mendocino/sof-rt5682s-hs-/sof-rt5682s-hs-.conf b/mendocino/sof-rt5682s-hs-/sof-rt5682s-hs-.conf index 845fca2..4fffece 100644 --- a/mendocino/sof-rt5682s-hs-/sof-rt5682s-hs-.conf +++ b/mendocino/sof-rt5682s-hs-/sof-rt5682s-hs-.conf @@ -1,8 +1,9 @@ Syntax 6 -Comment "Skyrim internal card for ALC5682I-VS ALC1019" - SectionUseCase."HiFi" { File "HiFi.conf" Comment "Default" } + +Include.codec-init.File "/codecs/rt5682s/init.conf" +Include.speaker-init.File "/codecs/rt1019/init.conf" diff --git a/stoney/acpd7219m98357/HiFi.conf b/stoney/acpd7219m98357/HiFi.conf index ff64063..8b2985d 100644 --- a/stoney/acpd7219m98357/HiFi.conf +++ b/stoney/acpd7219m98357/HiFi.conf @@ -1,27 +1,3 @@ -SectionVerb { - EnableSequence [ - cset "name='Playback Digital Volume' 111" - cset "name='Playback Digital Switch' on" - cset "name='Out DACL Mux' DAIL" - cset "name='Out DACR Mux' DAIR" - cset "name='Mixer Out FilterL DACL Switch' on" - cset "name='Mixer Out FilterR DACR Switch' on" - cset "name='ST Mixer Out FilterL Out FilterL Switch' on" - cset "name='ST Mixer Out FilterR Out FilterR Switch' on" - cset "name='Headphone Switch' off" - cset "name='Headset Mic Switch' off" - cset "name='Mic Volume' 5" - cset "name='Capture Digital Volume' 111" - cset "name='Capture Digital Switch' on" - cset "name='Mixin Volume' 10" - cset "name='Mixin Switch' on" - cset "name='Mixer In Mic Switch' on" - cset "name='Out DAIL Mux' ADC" - cset "name='Out DAIR Mux' ADC" - cset "name='Gain Ramp Rate' 1" - ] -} - SectionDevice."Speaker" { Comment "Speaker" diff --git a/stoney/acpd7219m98357/acpd7219m98357.conf b/stoney/acpd7219m98357/acpd7219m98357.conf index 05510b2..14126dd 100644 --- a/stoney/acpd7219m98357/acpd7219m98357.conf +++ b/stoney/acpd7219m98357/acpd7219m98357.conf @@ -1,8 +1,8 @@ Syntax 6 -Comment "Default Grunt family internal card" - SectionUseCase."HiFi" { File "HiFi.conf" Comment "Default" } + +Include.codec-init.File "/codecs/da7219/init.conf"