diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2020-06-05 18:20:58 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2020-06-16 13:44:03 +0200 |
| commit | 0a8dd118f7b56372e3f0d6037fe91e4e8108f508 (patch) | |
| tree | 8cb5657723a4a5ee34561eb8cf18a200a3aff46d /ucm2 | |
| parent | 4c1189fdcb4819df6c36cf490d17f532f82c8bbe (diff) | |
ucm2: use Include (Syntax 3)
Instead the unconditional include, use the Include configuration
directive which can load some files when evaluated (on demand only).
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'ucm2')
71 files changed, 814 insertions, 1006 deletions
diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf index bfd1ee5..84296d1 100644 --- a/ucm2/DB845c/DB845c.conf +++ b/ucm2/DB845c/DB845c.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/DB845c/HiFi.conf b/ucm2/DB845c/HiFi.conf index 7b62e37..1ef57c1 100644 --- a/ucm2/DB845c/HiFi.conf +++ b/ucm2/DB845c/HiFi.conf @@ -5,13 +5,17 @@ SectionVerb { EnableSequence [ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" - - <codecs/wcd934x/DefaultEnableSeq.conf> - <codecs/wsa881x/DefaultEnableSeq.conf> ] + Include.wcde.File "/codecs/wcd934x/DefaultEnableSeq.conf" + Include.wsae.File "/codecs/wsa881x/DefaultEnableSeq.conf" + + Include.wcdd { + File "/codecs/wcd934x/DefaultDisableSeq.conf" + Before.DisableSequence "0" + } + DisableSequence [ - <codecs/wcd934x/DefaultDisableSeq.conf> cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" ] @@ -23,15 +27,10 @@ SectionVerb { SectionDevice."Speaker" { Comment "Speaker playback" - EnableSequence [ - <codecs/wcd934x/SpeakerEnableSeq.conf> - <codecs/wsa881x/SpeakerEnableSeq.conf> - ] - - DisableSequence [ - <codecs/wsa881x/SpeakerDisableSeq.conf> - <codecs/wcd934x/SpeakerDisableSeq.conf> - ] + Include.wcde.File "/codecs/wcd934x/SpeakerEnableSeq.conf" + Include.wsae.File "/codecs/wsa881x/SpeakerEnableSeq.conf" + Include.wsad.File "/codecs/wsa881x/SpeakerDisableSeq.conf" + Include.wcdd.File "/codecs/wcd934x/SpeakerDisableSeq.conf" Value { PlaybackPriority 100 diff --git a/ucm2/SOF/HiFi.conf b/ucm2/SOF/HiFi.conf index ed4b163..82a66a0 100644 --- a/ucm2/SOF/HiFi.conf +++ b/ucm2/SOF/HiFi.conf @@ -1,13 +1,10 @@ - If.bytcht_rt5640 { Condition { Type String Haystack "${CardName}" Needle "bytcht rt5640" } - True { - <bytcr-rt5640/HiFi.conf> - } + True.Include.main.File "/bytcr-rt5640/HiFi.conf" } If.bytcht_rt5651 { @@ -16,9 +13,7 @@ If.bytcht_rt5651 { Haystack "${CardName}" Needle "bytcht rt5651" } - True { - <bytcr-rt5651/HiFi.conf> - } + True.Include.main.File "/bytcr-rt5651/HiFi.conf" } If.bytcht_cx2072x { @@ -27,9 +22,7 @@ If.bytcht_cx2072x { Haystack "${CardName}" Needle "bytcht cx2072x" } - True { - <bytcht-cx2072x/HiFi.conf> - } + True.Include.main.File "/bytcht-cx2072x/HiFi.conf" } If.bytcht_es8316 { @@ -38,9 +31,7 @@ If.bytcht_es8316 { Haystack "${CardName}" Needle "bytcht es8316" } - True { - <bytcht-es8316/HiFi.conf> - } + True.Include.main.File "/bytcht-es8316/HiFi.conf" } If.bytcht_rt5672 { @@ -49,9 +40,7 @@ If.bytcht_rt5672 { Haystack "${CardName}" Needle "bytcht rt5672" } - True { - <cht-bsw-rt5672/HiFi.conf> - } + True.Include.main.File "/cht-bsw-rt5672/HiFi.conf" } If.bytcht_nau8824 { @@ -60,9 +49,7 @@ If.bytcht_nau8824 { Haystack "${CardName}" Needle "bytcht nau8824" } - True { - <chtnau8824/HiFi.conf> - } + True.Include.main.File "/chtnau8824/HiFi.conf" } If.bytcht_rt5645 { @@ -71,9 +58,7 @@ If.bytcht_rt5645 { Haystack "${CardName}" Needle "bytcht rt5645" } - True { - <chtrt5645/HiFi.conf> - } + True.Include.main.File "/chtrt5645/HiFi.conf" } If.bytcht_rt5650 { @@ -82,9 +67,7 @@ If.bytcht_rt5650 { Haystack "${CardName}" Needle "bytcht rt5650" } - True { - <chtrt5650/HiFi.conf> - } + True.Include.main.File "/chtrt5650/HiFi.conf" } If.bytcht_max98090 { @@ -93,7 +76,5 @@ If.bytcht_max98090 { Haystack "${CardName}" Needle "bytcht max98090" } - True { - <chtmax98090/HiFi.conf> - } + True.Include.main.File "/chtmax98090/HiFi.conf" } diff --git a/ucm2/SOF/SOF.conf b/ucm2/SOF/SOF.conf index d7a0518..af966ef 100644 --- a/ucm2/SOF/SOF.conf +++ b/ucm2/SOF/SOF.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/broxton-rt298/HiFi.conf b/ucm2/broxton-rt298/HiFi.conf index f7e561f..4173917 100644 --- a/ucm2/broxton-rt298/HiFi.conf +++ b/ucm2/broxton-rt298/HiFi.conf @@ -109,4 +109,4 @@ SectionDevice."Headset" { } } -<broxton-rt298/Hdmi.conf> +Include.hdmi.File "/broxton-rt298/Hdmi.conf" diff --git a/ucm2/broxton-rt298/broxton-rt298.conf b/ucm2/broxton-rt298/broxton-rt298.conf index 95f9ac5..5167c9e 100644 --- a/ucm2/broxton-rt298/broxton-rt298.conf +++ b/ucm2/broxton-rt298/broxton-rt298.conf @@ -1,7 +1,7 @@ # UCM for Intel Broxton platforms # For Audio in I2S mode -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/bytcht-cx2072x/HiFi.conf b/ucm2/bytcht-cx2072x/HiFi.conf index 1ac4931..bf4ed11 100644 --- a/ucm2/bytcht-cx2072x/HiFi.conf +++ b/ucm2/bytcht-cx2072x/HiFi.conf @@ -1,36 +1,23 @@ SectionVerb { + Include.e.File "/codecs/cx2072x/EnableSeq.conf" + Include.d.File "/codecs/cx2072x/DisableSeq.conf" + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/cx2072x/EnableSeq.conf> - ] - - DisableSequence [ - <codecs/cx2072x/DisableSeq.conf> - <platforms/bytcr/PlatformDisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/cx2072x/EnableSeq.conf> - ] - - DisableSequence [ - <codecs/cx2072x/DisableSeq.conf> - ] - + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } -<codecs/cx2072x/Speaker.conf> -<codecs/cx2072x/HeadPhones.conf> +Include.spk.File "/codecs/cx2072x/Speaker.conf" +Include.hp.File "/codecs/cx2072x/HeadPhones.conf" -<codecs/cx2072x/InternalMic.conf> -<codecs/cx2072x/HeadsetMic.conf> +Include.imic.File "/codecs/cx2072x/InternalMic.conf" +Include.hsmic.File "/codecs/cx2072x/HeadsetMic.conf" diff --git a/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf b/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf index d7a0518..af966ef 100644 --- a/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf +++ b/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/bytcht-es8316/HiFi-Components.conf b/ucm2/bytcht-es8316/HiFi-Components.conf index c40bd49..825ba5c 100644 --- a/ucm2/bytcht-es8316/HiFi-Components.conf +++ b/ucm2/bytcht-es8316/HiFi-Components.conf @@ -4,9 +4,7 @@ If.spk { Haystack "${CardComponents}" Needle "cfg-spk:2" } - True { - <codecs/es8316/Speaker.conf> - } + True.Include.spk.File "/codecs/es8316/Speaker.conf" } If.mono { @@ -15,12 +13,10 @@ If.mono { Haystack "${CardComponents}" Needle "cfg-spk:1" } - True { - <codecs/es8316/MonoSpeaker.conf> - } + True.Include.mspk.File "/codecs/es8316/MonoSpeaker.conf" } -<codecs/es8316/HeadPhones.conf> +Include.hs.File "/codecs/es8316/HeadPhones.conf" If.in1 { Condition { @@ -29,8 +25,8 @@ If.in1 { Needle "cfg-mic:in1" } True { - <codecs/es8316/IN1-InternalMic.conf> - <codecs/es8316/IN2-HeadsetMic.conf> + Include.mic.File "/codecs/es8316/IN1-InternalMic.conf" + Include.hsmic.File "/codecs/es8316/IN2-HeadsetMic.conf" } } @@ -41,7 +37,7 @@ If.in2 { Needle "cfg-mic:in2" } True { - <codecs/es8316/IN1-HeadsetMic.conf> - <codecs/es8316/IN2-InternalMic.conf> + Include.hsmic.File "/codecs/es8316/IN1-HeadsetMic.conf" + Include.mic.File "/codecs/es8316/IN2-InternalMic.conf" } } diff --git a/ucm2/bytcht-es8316/HiFi-LongName.conf b/ucm2/bytcht-es8316/HiFi-LongName.conf index 03cf17b..ed88aff 100644 --- a/ucm2/bytcht-es8316/HiFi-LongName.conf +++ b/ucm2/bytcht-es8316/HiFi-LongName.conf @@ -4,9 +4,7 @@ If.spk { Haystack "${CardLongName}" Needle "-stereo-spk" } - True { - <codecs/es8316/Speaker.conf> - } + True.Include.spk.File "/codecs/es8316/Speaker.conf" } If.mono { @@ -15,12 +13,10 @@ If.mono { Haystack "${CardLongName}" Needle "-mono-spk" } - True { - <codecs/es8316/MonoSpeaker.conf> - } + True.Include.mspk.File "/codecs/es8316/MonoSpeaker.conf" } -<codecs/es8316/HeadPhones.conf> +Include.hs.File "/codecs/es8316/HeadPhones.conf" If.in1 { Condition { @@ -29,8 +25,8 @@ If.in1 { Needle "-in1-mic" } True { - <codecs/es8316/IN1-InternalMic.conf> - <codecs/es8316/IN2-HeadsetMic.conf> + Include.mic.File "/codecs/es8316/IN1-InternalMic.conf" + Include.hsmic.File "/codecs/es8316/IN2-HeadsetMic.conf" } } @@ -41,7 +37,7 @@ If.in2 { Needle "-in2-mic" } True { - <codecs/es8316/IN1-HeadsetMic.conf> - <codecs/es8316/IN2-InternalMic.conf> + Include.hsmic.File "/codecs/es8316/IN1-HeadsetMic.conf" + Include.mic.File "/codecs/es8316/IN2-InternalMic.conf" } } diff --git a/ucm2/bytcht-es8316/HiFi.conf b/ucm2/bytcht-es8316/HiFi.conf index 2143d79..d122c69 100644 --- a/ucm2/bytcht-es8316/HiFi.conf +++ b/ucm2/bytcht-es8316/HiFi.conf @@ -1,24 +1,15 @@ SectionVerb { + Include.e.File "/codecs/es8316/EnableSeq.conf" If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/es8316/EnableSeq.conf> - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/es8316/EnableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } @@ -29,10 +20,6 @@ If.0 { Haystack "${CardComponents}" Needle "cfg-spk:" } - True { - <bytcht-es8316/HiFi-Components.conf> - } - False { - <bytcht-es8316/HiFi-LongName.conf> - } + True.Include.comp.File "/bytcht-es8316/HiFi-Components.conf" + False.Include.long.File "/bytcht-es8316/HiFi-LongName.conf" } diff --git a/ucm2/bytcht-es8316/bytcht-es8316.conf b/ucm2/bytcht-es8316/bytcht-es8316.conf index d7a0518..af966ef 100644 --- a/ucm2/bytcht-es8316/bytcht-es8316.conf +++ b/ucm2/bytcht-es8316/bytcht-es8316.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/bytcr-rt5640/HiFi-Components.conf b/ucm2/bytcr-rt5640/HiFi-Components.conf index 75f0c83..2ce4f59 100644 --- a/ucm2/bytcr-rt5640/HiFi-Components.conf +++ b/ucm2/bytcr-rt5640/HiFi-Components.conf @@ -4,9 +4,7 @@ If.spk { Haystack "${CardComponents}" Needle "cfg-spk:2" } - True { - <codecs/rt5640/Speaker.conf> - } + True.Include.spk.File "/codecs/rt5640/Speaker.conf" } If.mono { @@ -15,12 +13,10 @@ If.mono { Haystack "${CardComponents}" Needle "cfg-spk:1" } - True { - <codecs/rt5640/MonoSpeaker.conf> - } + True.Include.mspk.File "/codecs/rt5640/MonoSpeaker.conf" } -<codecs/rt5640/HeadPhones.conf> +Include.hs.File "/codecs/rt5640/HeadPhones.conf" If.dmic1 { Condition { @@ -28,9 +24,7 @@ If.dmic1 { Haystack "${CardComponents}" Needle "cfg-mic:dmic1" } - True { - <codecs/rt5640/DigitalMics.conf> - } + True.Include.dmic.File "/codecs/rt5640/DigitalMics.conf" } If.in1 { @@ -39,9 +33,7 @@ If.in1 { Haystack "${CardComponents}" Needle "cfg-mic:in1" } - True { - <codecs/rt5640/IN1-InternalMic.conf> - } + True.Include.mic1.File "/codecs/rt5640/IN1-InternalMic.conf" } If.in3 { @@ -50,9 +42,7 @@ If.in3 { Haystack "${CardComponents}" Needle "cfg-mic:in3" } - True { - <codecs/rt5640/IN3-InternalMic.conf> - } + True.Include.mic3.File "/codecs/rt5640/IN3-InternalMic.conf" } -<codecs/rt5640/HeadsetMic.conf> +Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf" diff --git a/ucm2/bytcr-rt5640/HiFi-LongName.conf b/ucm2/bytcr-rt5640/HiFi-LongName.conf index e930f35..c07f153 100644 --- a/ucm2/bytcr-rt5640/HiFi-LongName.conf +++ b/ucm2/bytcr-rt5640/HiFi-LongName.conf @@ -4,9 +4,7 @@ If.spk { Haystack "${CardLongName}" Needle "-stereo-spk" } - True { - <codecs/rt5640/Speaker.conf> - } + True.Include.spk.File "/codecs/rt5640/Speaker.conf" } If.mono { @@ -15,12 +13,10 @@ If.mono { Haystack "${CardLongName}" Needle "-mono-spk" } - True { - <codecs/rt5640/MonoSpeaker.conf> - } + True.Include.mspk.File "/codecs/rt5640/MonoSpeaker.conf" } -<codecs/rt5640/HeadPhones.conf> +Include.hs.File "/codecs/rt5640/HeadPhones.conf" If.dmic1 { Condition { @@ -28,9 +24,7 @@ If.dmic1 { Haystack "${CardLongName}" Needle "-dmic1-mic" } - True { - <codecs/rt5640/DigitalMics.conf> - } + True.Include.dmic.File "/codecs/rt5640/DigitalMics.conf" } If.in1 { @@ -39,9 +33,7 @@ If.in1 { Haystack "${CardLongName}" Needle "-in1-mic" } - True { - <codecs/rt5640/IN1-InternalMic.conf> - } + True.Include.mic1.File "/codecs/rt5640/IN1-InternalMic.conf" } If.in3 { @@ -50,9 +42,7 @@ If.in3 { Haystack "${CardLongName}" Needle "-in3-mic" } - True { - <codecs/rt5640/IN3-InternalMic.conf> - } + True.Include.mic3.File "/codecs/rt5640/IN3-InternalMic.conf" } -<codecs/rt5640/HeadsetMic.conf> +Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf" diff --git a/ucm2/bytcr-rt5640/HiFi.conf b/ucm2/bytcr-rt5640/HiFi.conf index 89795cb..a5c05ba 100644 --- a/ucm2/bytcr-rt5640/HiFi.conf +++ b/ucm2/bytcr-rt5640/HiFi.conf @@ -1,27 +1,17 @@ # Use case Configuration for bytcr-rt5640 - SectionVerb { + Include.e.File "/codecs/rt5640/EnableSeq.conf" If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/rt5640/EnableSeq.conf> - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/rt5640/EnableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } @@ -32,10 +22,6 @@ If.0 { Haystack "${CardComponents}" Needle "cfg-spk:" } - True { - <bytcr-rt5640/HiFi-Components.conf> - } - False { - <bytcr-rt5640/HiFi-LongName.conf> - } + True.Include.comp.File "/bytcr-rt5640/HiFi-Components.conf" + False.Include.long.File "/bytcr-rt5640/HiFi-LongName.conf" } diff --git a/ucm2/bytcr-rt5640/bytcr-rt5640.conf b/ucm2/bytcr-rt5640/bytcr-rt5640.conf index d7a0518..af966ef 100644 --- a/ucm2/bytcr-rt5640/bytcr-rt5640.conf +++ b/ucm2/bytcr-rt5640/bytcr-rt5640.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/bytcr-rt5651/HiFi-Components.conf b/ucm2/bytcr-rt5651/HiFi-Components.conf index 966e879..3584a4e 100644 --- a/ucm2/bytcr-rt5651/HiFi-Components.conf +++ b/ucm2/bytcr-rt5651/HiFi-Components.conf @@ -5,7 +5,7 @@ If.spk { Needle "cfg-spk:2" } True { - <codecs/rt5651/Speaker.conf> + Include.spk.File "/codecs/rt5651/Speaker.conf" } } @@ -16,7 +16,7 @@ If.mono { Needle "cfg-spk:1" } True { - <codecs/rt5651/MonoSpeaker.conf> + Include.mspk.File "/codecs/rt5651/MonoSpeaker.conf" } } @@ -27,10 +27,10 @@ If.headphones { Needle "cfg-hp:lrswap" } True { - <codecs/rt5651/HeadPhones-swapped.conf> + Include.hp.File "/codecs/rt5651/HeadPhones-swapped.conf" } False { - <codecs/rt5651/HeadPhones.conf> + Include.hp.File "/codecs/rt5651/HeadPhones.conf" } } @@ -41,12 +41,12 @@ If.dmic { Needle "cfg-mic:dmic" } True { - <codecs/rt5651/DigitalMic.conf> - <codecs/rt5651/IN2-HeadsetMic.conf> + Include.dmic.File "/codecs/rt5651/DigitalMic.conf" + Include.hsmic.File "/codecs/rt5651/IN2-HeadsetMic.conf" SectionDevice."Mic".ConflictingDevice.0 "Headset" } False { - <codecs/rt5651/IN3-HeadsetMic.conf> + Include.hsmic.File "/codecs/rt5651/IN3-HeadsetMic.conf" } } @@ -57,7 +57,7 @@ If.in2 { Needle "cfg-mic:in2" } True { - <codecs/rt5651/IN2-InternalMic.conf> + Include.mic.File "/codecs/rt5651/IN2-InternalMic.conf" } } @@ -68,7 +68,7 @@ If.in12 { Needle "cfg-mic:in12" } True { - <codecs/rt5651/IN12-InternalMic.conf> + Include.mic.File "/codecs/rt5651/IN12-InternalMic.conf" } False { If.in1 { @@ -78,7 +78,7 @@ If.in12 { Needle "cfg-mic:in1" } True { - <codecs/rt5651/IN1-InternalMic.conf> + Include.mic.File "/codecs/rt5651/IN1-InternalMic.conf" } } } diff --git a/ucm2/bytcr-rt5651/HiFi-LongName.conf b/ucm2/bytcr-rt5651/HiFi-LongName.conf index e6dd908..436106d 100644 --- a/ucm2/bytcr-rt5651/HiFi-LongName.conf +++ b/ucm2/bytcr-rt5651/HiFi-LongName.conf @@ -5,7 +5,7 @@ If.spk { Needle "-stereo-spk" } True { - <codecs/rt5651/Speaker.conf> + Include.spk.File "/codecs/rt5651/Speaker.conf" } } @@ -16,7 +16,7 @@ If.mono { Needle "-mono-spk" } True { - <codecs/rt5651/MonoSpeaker.conf> + Include.mspk.File "/codecs/rt5651/MonoSpeaker.conf" } } @@ -27,10 +27,10 @@ If.headphones { Needle "-mic-hp-swapped" } True { - <codecs/rt5651/HeadPhones-swapped.conf> + Include.hp.File "/codecs/rt5651/HeadPhones-swapped.conf" } False { - <codecs/rt5651/HeadPhones.conf> + Include.hp.File "/codecs/rt5651/HeadPhones.conf" } } @@ -41,11 +41,11 @@ If.dmic1 { Needle "-dmic1-mic" } True { - <codecs/rt5651/DigitalMic.conf> - <codecs/rt5651/IN2-HeadsetMic.conf> + Include.dmic.File "/codecs/rt5651/DigitalMic.conf" + Include.hsmic.File "/codecs/rt5651/IN2-HeadsetMic.conf" } False { - <codecs/rt5651/IN3-HeadsetMic.conf> + Include.hsmic.File "/codecs/rt5651/IN3-HeadsetMic.conf" } } @@ -56,7 +56,7 @@ If.in1 { Needle "-in1-mic" } True { - <codecs/rt5651/IN1-InternalMic.conf> + Include.mic.File "/codecs/rt5651/IN1-InternalMic.conf" } } @@ -67,7 +67,7 @@ If.in2 { Needle "-in2-mic" } True { - <codecs/rt5651/IN2-InternalMic.conf> + Include.mic.File "/codecs/rt5651/IN2-InternalMic.conf" } } @@ -78,6 +78,6 @@ If.in12 { Needle "-in12-mic" } True { - <codecs/rt5651/IN12-InternalMic.conf> + Include.mic.File "/codecs/rt5651/IN12-InternalMic.conf" } } diff --git a/ucm2/bytcr-rt5651/HiFi.conf b/ucm2/bytcr-rt5651/HiFi.conf index 3f664d7..031334d 100644 --- a/ucm2/bytcr-rt5651/HiFi.conf +++ b/ucm2/bytcr-rt5651/HiFi.conf @@ -3,25 +3,17 @@ SectionVerb { + Include.e.File "/codecs/rt5651/EnableSeq.conf" + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/rt5651/EnableSeq.conf> - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/rt5651/EnableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } @@ -33,9 +25,9 @@ If.0 { Needle "cfg-spk:" } True { - <bytcr-rt5651/HiFi-Components.conf> + Include.comp.File "/bytcr-rt5651/HiFi-Components.conf" } False { - <bytcr-rt5651/HiFi-LongName.conf> + Include.long.File "/bytcr-rt5651/HiFi-LongName.conf" } } diff --git a/ucm2/bytcr-rt5651/bytcr-rt5651.conf b/ucm2/bytcr-rt5651/bytcr-rt5651.conf index 64888ba..b6a7407 100644 --- a/ucm2/bytcr-rt5651/bytcr-rt5651.conf +++ b/ucm2/bytcr-rt5651/bytcr-rt5651.conf @@ -1,6 +1,6 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf b/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf index 50612aa..0d95e90 100644 --- a/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf +++ b/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf @@ -1,36 +1,27 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672 SectionVerb { + Include.e.File "/codecs/rt5672/EnableSeq.conf" If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/rt5672/EnableSeq.conf> - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/rt5672/EnableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } -<codecs/rt5672/Speaker.conf> +Include.spk.File "/codecs/rt5672/Speaker.conf" RenameDevice."Speaker1" "Speaker" RemoveDevice."Speaker2" "Speaker2" -<codecs/rt5672/HeadPhones.conf> +Include.hp.File "/codecs/rt5672/HeadPhones.conf" -<codecs/rt5672/DMIC2.conf> +Include.dmic.File "/codecs/rt5672/DMIC2.conf" RenameDevice."Mic2" "Mic" RemoveDevice."Mic1" "Mic1" -<codecs/rt5672/HeadsetMic.conf> +Include.hsmic.File "/codecs/rt5672/HeadsetMic.conf" diff --git a/ucm2/cht-bsw-rt5672/HiFi.conf b/ucm2/cht-bsw-rt5672/HiFi.conf index fd34452..39cb0fe 100644 --- a/ucm2/cht-bsw-rt5672/HiFi.conf +++ b/ucm2/cht-bsw-rt5672/HiFi.conf @@ -2,33 +2,22 @@ SectionVerb { + Include.e.File "/codecs/rt5672/EnableSeq.conf" + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } - True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/rt5672/EnableSeq.conf> - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/rt5672/EnableSeq.conf> - ] - } + Before.EnableSequence "0" + True.Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" } } -<codecs/rt5672/Speaker.conf> -<codecs/rt5672/MonoSpeaker.conf> -<codecs/rt5672/HeadPhones.conf> +Include.spk.File "/codecs/rt5672/Speaker.conf" +Include.mspk.File "/codecs/rt5672/MonoSpeaker.conf" +Include.hp.File "/codecs/rt5672/HeadPhones.conf" -<codecs/rt5672/DMIC1.conf> -<codecs/rt5672/DMIC2.conf> -<codecs/rt5672/HeadsetMic.conf> +Include.dmic1.File "/codecs/rt5672/DMIC1.conf" +Include.dmic2.File "/codecs/rt5672/DMIC2.conf" +Include.hsmic.File "/codecs/rt5672/HeadsetMic.conf" diff --git a/ucm2/cht-bsw-rt5672/cht-bsw-rt5672-stereo-dmic2.conf b/ucm2/cht-bsw-rt5672/cht-bsw-rt5672-stereo-dmic2.conf index 68837b2..e793e9d 100644 --- a/ucm2/cht-bsw-rt5672/cht-bsw-rt5672-stereo-dmic2.conf +++ b/ucm2/cht-bsw-rt5672/cht-bsw-rt5672-stereo-dmic2.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi-stereo-dmic2.conf" diff --git a/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf b/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf index eb1f60a..db2924f 100644 --- a/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf +++ b/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf @@ -1,6 +1,6 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672 -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/chtmax98090/HiFi.conf b/ucm2/chtmax98090/HiFi.conf index e5015f7..d7f69a9 100644 --- a/ucm2/chtmax98090/HiFi.conf +++ b/ucm2/chtmax98090/HiFi.conf @@ -3,22 +3,17 @@ SectionVerb { TQ "HiFi" } + Include.e.File "/codecs/max98090/EnableSeq.conf" + If.platform { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } - True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - ] - } + Before.EnableSequence "0" + True.Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" } - EnableSequence [ - <codecs/max98090/EnableSeq.conf> - ] - If.Quawks { Condition { Type String @@ -35,7 +30,7 @@ SectionVerb { } } -<codecs/max98090/Headphones.conf> -<codecs/max98090/Speaker.conf> -<codecs/max98090/InternalMic.conf> -<codecs/max98090/HeadsetMic.conf> +Include.hs.File "/codecs/max98090/Headphones.conf" +Include.spk.File "/codecs/max98090/Speaker.conf" +Include.mic.File "/codecs/max98090/InternalMic.conf" +Include.hsmic.File "/codecs/max98090/HeadsetMic.conf" diff --git a/ucm2/chtmax98090/chtmax98090.conf b/ucm2/chtmax98090/chtmax98090.conf index 84f7a1c..dc51cdb 100644 --- a/ucm2/chtmax98090/chtmax98090.conf +++ b/ucm2/chtmax98090/chtmax98090.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" Comment "Play HiFi quality Music" diff --git a/ucm2/chtnau8824/HiFi-mono.conf b/ucm2/chtnau8824/HiFi-mono.conf index e87ebe3..6d899ce 100644 --- a/ucm2/chtnau8824/HiFi-mono.conf +++ b/ucm2/chtnau8824/HiFi-mono.conf @@ -5,31 +5,23 @@ SectionVerb { TQ "HiFi" } + Include.e.File "/codecs/nau8824/EnableSeq.conf" + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/nau8824/EnableSeq.conf> - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/nau8824/EnableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } -<codecs/nau8824/MonoSpeaker.conf> -<codecs/nau8824/HeadPhones.conf> +Include.mspk.File "/codecs/nau8824/MonoSpeaker.conf" +Include.hp.File "/codecs/nau8824/HeadPhones.conf" -<codecs/nau8824/InternalMic.conf> -<codecs/nau8824/HeadsetMic.conf> +Include.mic.File "/codecs/nau8824/InternalMic.conf" +Include.hsmic.File "/codecs/nau8824/HeadsetMic.conf" diff --git a/ucm2/chtnau8824/HiFi.conf b/ucm2/chtnau8824/HiFi.conf index 6ed4e4f..b3c0209 100644 --- a/ucm2/chtnau8824/HiFi.conf +++ b/ucm2/chtnau8824/HiFi.conf @@ -1,31 +1,29 @@ + SectionVerb { + Value { + TQ "HiFi" + } + + Include.e.File "/codecs/nau8824/EnableSeq.conf" + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/nau8824/EnableSeq.conf> - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/nau8824/EnableSeq.conf> - ] + Include.pe { + File "/platforms/bytcr/PlatformEnableSeq.conf" + Before.EnableSequence "0" + } + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } +Include.spk.File "/codecs/nau8824/Speaker.conf" +Include.hp.File "/codecs/nau8824/HeadPhones.conf" -<codecs/nau8824/Speaker.conf> -<codecs/nau8824/HeadPhones.conf> - -<codecs/nau8824/InternalMic.conf> -<codecs/nau8824/HeadsetMic.conf> +Include.mic.File "/codecs/nau8824/InternalMic.conf" +Include.hsmic.File "/codecs/nau8824/HeadsetMic.conf" diff --git a/ucm2/chtnau8824/chtnau8824-mono.conf b/ucm2/chtnau8824/chtnau8824-mono.conf index 75f4870..6c498c7 100644 --- a/ucm2/chtnau8824/chtnau8824-mono.conf +++ b/ucm2/chtnau8824/chtnau8824-mono.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 Comment "chtnau8824 internal card" diff --git a/ucm2/chtnau8824/chtnau8824.conf b/ucm2/chtnau8824/chtnau8824.conf index acd5deb..64ed4e4 100644 --- a/ucm2/chtnau8824/chtnau8824.conf +++ b/ucm2/chtnau8824/chtnau8824.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 Comment "chtnau8824 internal card" diff --git a/ucm2/chtrt5645/HiFi-dmic1.conf b/ucm2/chtrt5645/HiFi-dmic1.conf index 4e9ada8..f28783f 100644 --- a/ucm2/chtrt5645/HiFi-dmic1.conf +++ b/ucm2/chtrt5645/HiFi-dmic1.conf @@ -4,44 +4,27 @@ SectionVerb { TQ "HiFi" } + Include.ce.File "/codecs/rt5645/EnableSeq.conf" + Include.cd.File "/codecs/rt5645/DisableSeq.conf" + + EnableSequence [ + cset "name='Stereo1 ADC1 Mux' 1" + cset "name='I2S2 Func Switch' on" + # 3/12 the headphone mic tends to be quite loud + cset "name='IN1 Boost' 3" + # 8/8 the internal analog mic tends to be quite soft + cset "name='IN2 Boost' 8" + ] + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/rt5645/EnableSeq.conf> - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - <codecs/rt5645/DisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/rt5645/EnableSeq.conf> - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - <codecs/rt5645/DisableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } @@ -58,9 +41,7 @@ SectionDevice."Speaker" { "Headphones" ] - EnableSequence [ - <codecs/rt5645/SpeakerEnableSeq.conf> - ] + Include.e.File "/codecs/rt5645/SpeakerEnableSeq.conf" DisableSequence [ cset "name='Ext Spk Switch' off" @@ -81,9 +62,7 @@ SectionDevice."Headphones" { "Speaker" ] - EnableSequence [ - <codecs/rt5645/HeadphonesEnableSeq.conf> - ] + Include.e.File "/codecs/rt5645/HeadphonesEnableSeq.conf" DisableSequence [ cset "name='Headphone Switch' off" @@ -99,18 +78,15 @@ SectionDevice."Mic" { CapturePCM "hw:${CardId}" } - EnableSequence [ - <codecs/rt5645/DigitalMicEnableSeq.conf> + Include.e.File "/codecs/rt5645/DigitalMicEnableSeq.conf" + Include.d.File "/codecs/rt5645/DigitalMicDisableSeq.conf" + EnableSequence [ cset "name='Stereo1 DMIC Mux' DMIC1" cset "name='Stereo1 ADC2 Mux' DMIC" cset "name='Mono ADC L2 Mux' DMIC" cset "name='Mono ADC R2 Mux' DMIC" ] - - DisableSequence [ - <codecs/rt5645/DigitalMicDisableSeq.conf> - ] } SectionDevice."Headset" { @@ -122,9 +98,10 @@ SectionDevice."Headset" { JackControl "Headset Mic Jack" } - EnableSequence [ - <codecs/rt5645/HSMicEnableSeq.conf> + Include.e.File "/codecs/rt5645/HSMicEnableSeq.conf" + Include.d.File "/codecs/rt5645/HSMicDisableSeq.conf" + EnableSequence [ cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off" @@ -133,8 +110,4 @@ SectionDevice."Headset" { cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off" ] - - DisableSequence [ - <codecs/rt5645/HSMicDisableSeq.conf> - ] } diff --git a/ucm2/chtrt5645/HiFi-dmic2.conf b/ucm2/chtrt5645/HiFi-dmic2.conf index aa2a87b..1407e9c 100644 --- a/ucm2/chtrt5645/HiFi-dmic2.conf +++ b/ucm2/chtrt5645/HiFi-dmic2.conf @@ -4,44 +4,27 @@ SectionVerb { TQ "HiFi" } + Include.ce.File "/codecs/rt5645/EnableSeq.conf" + Include.cd.File "/codecs/rt5645/DisableSeq.conf" + + EnableSequence [ + cset "name='Stereo1 ADC1 Mux' 1" + cset "name='I2S2 Func Switch' on" + # 3/12 the headphone mic tends to be quite loud + cset "name='IN1 Boost' 3" + # 8/8 the internal analog mic tends to be quite soft + cset "name='IN2 Boost' 8" + ] + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/rt5645/EnableSeq.conf> - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - <codecs/rt5645/DisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/rt5645/EnableSeq.conf> - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - <codecs/rt5645/DisableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } @@ -58,9 +41,7 @@ SectionDevice."Speaker" { "Headphones" ] - EnableSequence [ - <codecs/rt5645/SpeakerEnableSeq.conf> - ] + Include.e.File "/codecs/rt5645/SpeakerEnableSeq.conf" DisableSequence [ cset "name='Ext Spk Switch' off" @@ -81,9 +62,7 @@ SectionDevice."Headphones" { "Speaker" ] - EnableSequence [ - <codecs/rt5645/HeadphonesEnableSeq.conf> - ] + Include.e.File "/codecs/rt5645/HeadphonesEnableSeq.conf" DisableSequence [ cset "name='Headphone Switch' off" @@ -99,9 +78,10 @@ SectionDevice."Mic" { CapturePCM "hw:${CardId}" } - EnableSequence [ - <codecs/rt5645/DigitalMicEnableSeq.conf> + Include.e.File "/codecs/rt5645/DigitalMicEnableSeq.conf" + Include.d.File "/codecs/rt5645/DigitalMicDisableSeq.conf" + EnableSequence [ cset "name='Stereo1 DMIC Mux' DMIC2" cset "name='Stereo1 ADC2 Mux' DMIC" cset "name='Mono DMIC L Mux' DMIC2" @@ -109,10 +89,6 @@ SectionDevice."Mic" { cset "name='Mono ADC L2 Mux' DMIC" cset "name='Mono ADC R2 Mux' DMIC" ] - - DisableSequence [ - <codecs/rt5645/DigitalMicDisableSeq.conf> - ] } SectionDevice."Headset" { @@ -124,9 +100,10 @@ SectionDevice."Headset" { JackControl "Headset Mic Jack" } - EnableSequence [ - <codecs/rt5645/HSMicEnableSeq.conf> + Include.e.File "/codecs/rt5645/HSMicEnableSeq.conf" + Include.d.File "/codecs/rt5645/HSMicDisableSeq.conf" + EnableSequence [ cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off" @@ -135,8 +112,4 @@ SectionDevice."Headset" { cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off" ] - - DisableSequence [ - <codecs/rt5645/HSMicDisableSeq.conf> - ] } diff --git a/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf index fc8244e..7794cae 100644 --- a/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf +++ b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf @@ -4,44 +4,26 @@ SectionVerb { TQ "HiFi" } + Include.ce.File "/codecs/rt5645/EnableSeq.conf" + Include.cd.File "/codecs/rt5645/DisableSeq.conf" + + EnableSequence [ + cset "name='Stereo1 ADC1 Mux' 1" + cset "name='I2S2 Func Switch' on" + # 3/12 the headphone mic tends to be quite loud + cset "name='IN1 Boost' 3" + cset "name='IN2 Boost' 8" + ] + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/rt5645/EnableSeq.conf> - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - <codecs/rt5645/DisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/rt5645/EnableSeq.conf> - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - <codecs/rt5645/DisableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } @@ -58,12 +40,12 @@ SectionDevice."Speaker" { "Headphones" ] + Include.e.File "/codecs/rt5645/SpeakerEnableSeq.conf" + EnableSequence [ # Monospeaker: Mix right to left cset "name='Stereo DAC MIXL DAC R1 Switch' 1" cset "name='Stereo DAC MIXR DAC R1 Switch' 0" - - <codecs/rt5645/SpeakerEnableSeq.conf> ] DisableSequence [ @@ -85,12 +67,12 @@ SectionDevice."Headphones" { "Speaker" ] + Include.e.File "/codecs/rt5645/HeadphonesEnableSeq.conf" + EnableSequence [ # Undo monospeaker mixing cset "name='Stereo DAC MIXL DAC R1 Switch' 0" cset "name='Stereo DAC MIXR DAC R1 Switch' 1" - - <codecs/rt5645/HeadphonesEnableSeq.conf> ] DisableSequence [ @@ -99,7 +81,10 @@ SectionDevice."Headphones" { ] } -<codecs/rt5645/AnalogMic.conf> +Include.amic { + File "/codecs/rt5645/AnalogMic.conf" + Before.SectionDevice "Headset" +} SectionDevice."Headset" { Comment "Headset Microphone" @@ -110,9 +95,10 @@ SectionDevice."Headset" { JackControl "Headset Mic Jack" } - EnableSequence [ - <codecs/rt5645/HSMicEnableSeq.conf> + Include.e.File "/codecs/rt5645/HSMicEnableSeq.conf" + Include.d.File "/codecs/rt5645/HSMicDisableSeq.conf" + EnableSequence [ cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off" @@ -121,8 +107,4 @@ SectionDevice."Headset" { cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off" ] - - DisableSequence [ - <codecs/rt5645/HSMicDisableSeq.conf> - ] } diff --git a/ucm2/chtrt5645/HiFi.conf b/ucm2/chtrt5645/HiFi.conf index dd6328c..1adc9fc 100644 --- a/ucm2/chtrt5645/HiFi.conf +++ b/ucm2/chtrt5645/HiFi.conf @@ -4,44 +4,27 @@ SectionVerb { TQ "HiFi" } + Include.ce.File "/codecs/rt5645/EnableSeq.conf" + Include.cd.File "/codecs/rt5645/DisableSeq.conf" + + EnableSequence [ + cset "name='Stereo1 ADC1 Mux' 1" + cset "name='I2S2 Func Switch' on" + # 3/12 the headphone mic tends to be quite loud + cset "name='IN1 Boost' 3" + # 8/8 the internal analog mic tends to be quite soft + cset "name='IN2 Boost' 8" + ] + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/rt5645/EnableSeq.conf> - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - <platforms/bytcr/PlatformDisableSeq.conf> - <codecs/rt5645/DisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/rt5645/EnableSeq.conf> - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - <codecs/rt5645/DisableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } } @@ -58,9 +41,7 @@ SectionDevice."Speaker" { "Headphones" ] - EnableSequence [ - <codecs/rt5645/SpeakerEnableSeq.conf> - ] + Include.e.File "/codecs/rt5645/SpeakerEnableSeq.conf" DisableSequence [ cset "name='Ext Spk Switch' off" @@ -81,9 +62,7 @@ SectionDevice."Headphones" { "Speaker" ] - EnableSequence [ - <codecs/rt5645/HeadphonesEnableSeq.conf> - ] + Include.e.File "/codecs/rt5645/HeadphonesEnableSeq.conf" DisableSequence [ cset "name='Headphone Switch' off" @@ -91,7 +70,10 @@ SectionDevice."Headphones" { ] } -<codecs/rt5645/AnalogMic.conf> +Include.amic { + File "/codecs/rt5645/AnalogMic.conf" + Before.SectionDevice "Headset" +} SectionDevice."Headset" { Comment "Headset Microphone" @@ -102,9 +84,10 @@ SectionDevice."Headset" { JackControl "Headset Mic Jack" } - EnableSequence [ - <codecs/rt5645/HSMicEnableSeq.conf> + Include.e.File "/codecs/rt5645/HSMicEnableSeq.conf" + Include.d.File "/codecs/rt5645/HSMicDisableSeq.conf" + EnableSequence [ cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off" @@ -113,8 +96,4 @@ SectionDevice."Headset" { cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off" ] - - DisableSequence [ - <codecs/rt5645/HSMicDisableSeq.conf> - ] } diff --git a/ucm2/chtrt5645/chtrt5645-dmic1.conf b/ucm2/chtrt5645/chtrt5645-dmic1.conf index fc6c32f..60c3b50 100644 --- a/ucm2/chtrt5645/chtrt5645-dmic1.conf +++ b/ucm2/chtrt5645/chtrt5645-dmic1.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 Comment "Intel SoC Audio Device" SectionUseCase."HiFi" { File "HiFi-dmic1.conf" diff --git a/ucm2/chtrt5645/chtrt5645-dmic2.conf b/ucm2/chtrt5645/chtrt5645-dmic2.conf index 2ea095c..e944516 100644 --- a/ucm2/chtrt5645/chtrt5645-dmic2.conf +++ b/ucm2/chtrt5645/chtrt5645-dmic2.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 Comment "Intel SoC Audio Device" SectionUseCase."HiFi" { File "HiFi-dmic2.conf" diff --git a/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf b/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf index aacce6c..10d9a9e 100644 --- a/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf +++ b/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 Comment "Intel SoC Audio Device" SectionUseCase."HiFi" { File "HiFi-mono-speaker-analog-mic.conf" diff --git a/ucm2/chtrt5645/chtrt5645.conf b/ucm2/chtrt5645/chtrt5645.conf index 7de572a..63f135b 100644 --- a/ucm2/chtrt5645/chtrt5645.conf +++ b/ucm2/chtrt5645/chtrt5645.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 Comment "Intel SoC Audio Device" SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/chtrt5650/HiFi.conf b/ucm2/chtrt5650/HiFi.conf index 2342e85..66bf285 100644 --- a/ucm2/chtrt5650/HiFi.conf +++ b/ucm2/chtrt5650/HiFi.conf @@ -5,45 +5,28 @@ SectionVerb { TQ "HiFi" } + Include.e.File "/codecs/rt5645/EnableSeq.conf" + Include.d.File "/codecs/rt5645/DisableSeq.conf" + If.Controls { Condition { Type ControlExists Control "name='media0_in Gain 0 Switch'" } + Before.EnableSequence "0" True { - EnableSequence [ - <platforms/bytcr/PlatformEnableSeq.conf> - <codecs/rt5645/EnableSeq.conf> - - 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 [ - <platforms/bytcr/PlatformDisableSeq.conf> - <codecs/rt5645/DisableSeq.conf> - ] - } - False { - EnableSequence [ - <codecs/rt5645/EnableSeq.conf> - - 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 [ - <codecs/rt5645/DisableSeq.conf> - ] + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" } } + 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" + ] } SectionDevice."Speaker" { @@ -58,9 +41,7 @@ SectionDevice."Speaker" { "Headphones" ] - EnableSequence [ - <codecs/rt5645/SpeakerEnableSeq.conf> - ] + Include.spk.File "/codecs/rt5645/SpeakerEnableSeq.conf" DisableSequence [ cset "name='Ext Spk Switch' off" @@ -82,9 +63,7 @@ SectionDevice."Headphones" { "Speaker" ] - EnableSequence [ - <codecs/rt5645/HeadphonesEnableSeq.conf> - ] + Include.hse.File "/codecs/rt5645/HeadphonesEnableSeq.conf" DisableSequence [ cset "name='Headphone Switch' off" @@ -123,15 +102,15 @@ SectionDevice."Mic2" { JackHWMute "Mic1" } - EnableSequence [ - <codecs/rt5645/HSMicEnableSeq.conf> + Include.hsmice.File "/codecs/rt5645/HSMicEnableSeq.conf" + EnableSequence [ cset "name='IN1 Boost' 1" ] - DisableSequence [ - <codecs/rt5645/HSMicDisableSeq.conf> + Include.hsmicd.File "/codecs/rt5645/HSMicDisableSeq.conf" + DisableSequence [ cset "name='IN1 Boost' 0" ] } diff --git a/ucm2/chtrt5650/chtrt5650.conf b/ucm2/chtrt5650/chtrt5650.conf index 383180c..41c6d6b 100644 --- a/ucm2/chtrt5650/chtrt5650.conf +++ b/ucm2/chtrt5650/chtrt5650.conf @@ -1,5 +1,5 @@ Comment "Intel SoC Audio Device" -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" Comment "Default" diff --git a/ucm2/codecs/cx2072x/DisableSeq.conf b/ucm2/codecs/cx2072x/DisableSeq.conf index 1e3d548..ce3ad6d 100644 --- a/ucm2/codecs/cx2072x/DisableSeq.conf +++ b/ucm2/codecs/cx2072x/DisableSeq.conf @@ -1,7 +1,9 @@ -# Output Configuration -cset "name='I2S DAC1L Switch' off" -cset "name='I2S DAC1R Switch' off" +DisableSequence [ + # Output Configuration + cset "name='I2S DAC1L Switch' off" + cset "name='I2S DAC1R Switch' off" -# Input Configuration -cset "name='I2S ADC1L Switch' off" -cset "name='I2S ADC1R Switch' off" + # Input Configuration + cset "name='I2S ADC1L Switch' off" + cset "name='I2S ADC1R Switch' off" +] diff --git a/ucm2/codecs/cx2072x/EnableSeq.conf b/ucm2/codecs/cx2072x/EnableSeq.conf index fb8e3fe..02d918f 100644 --- a/ucm2/codecs/cx2072x/EnableSeq.conf +++ b/ucm2/codecs/cx2072x/EnableSeq.conf @@ -1,13 +1,15 @@ -# Disable all inputs / outputs -cset "name='Ext Spk Switch' off" -cset "name='Headphone Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='Int Mic Switch' off" +EnableSequence [ + # Disable all inputs / outputs + cset "name='Ext Spk Switch' off" + cset "name='Headphone Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Int Mic Switch' off" -# Output Configuration -cset "name='I2S DAC1L Switch' on" -cset "name='I2S DAC1R Switch' on" + # Output Configuration + cset "name='I2S DAC1L Switch' on" + cset "name='I2S DAC1R Switch' on" -# Input Configuration -cset "name='I2S ADC1L Switch' on" -cset "name='I2S ADC1R Switch' on" + # Input Configuration + cset "name='I2S ADC1L Switch' on" + cset "name='I2S ADC1R Switch' on" +] diff --git a/ucm2/codecs/es8316/EnableSeq.conf b/ucm2/codecs/es8316/EnableSeq.conf index 551b79b..97ccfc9 100644 --- a/ucm2/codecs/es8316/EnableSeq.conf +++ b/ucm2/codecs/es8316/EnableSeq.conf @@ -1,19 +1,21 @@ -# Disable all inputs / outputs -cset "name='Speaker Switch' off" -cset "name='Headphone Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='Internal Mic Switch' off" +EnableSequence [ + # Disable all inputs / outputs + cset "name='Speaker Switch' off" + cset "name='Headphone Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Internal Mic Switch' off" -# Set HP vol to 0 dB (3/3) -cset "name='Headphone Playback Volume' 3" -# Set HP mixer vol to -6 dB (4/7) louder does not work -cset "name='Headphone Mixer Volume' 4" -# Set DAC vol to 0 dB (192/192) -cset "name='DAC Playback Volume' 192" -# Set ADC vold to 0 dB (10/10) -cset "name='ADC PGA Gain Volume' 10" + # Set HP vol to 0 dB (3/3) + cset "name='Headphone Playback Volume' 3" + # Set HP mixer vol to -6 dB (4/7) louder does not work + cset "name='Headphone Mixer Volume' 4" + # Set DAC vol to 0 dB (192/192) + cset "name='DAC Playback Volume' 192" + # Set ADC vold to 0 dB (10/10) + cset "name='ADC PGA Gain Volume' 10" -# Setup muxes / switches -cset "name='Left Headphone Mixer Left DAC Switch' on" -cset "name='Right Headphone Mixer Right DAC Switch' on" -cset "name='ALC Capture Switch' on" + # Setup muxes / switches + cset "name='Left Headphone Mixer Left DAC Switch' on" + cset "name='Right Headphone Mixer Right DAC Switch' on" + cset "name='ALC Capture Switch' on" +] diff --git a/ucm2/codecs/max98090/EnableSeq.conf b/ucm2/codecs/max98090/EnableSeq.conf index a04420f..23c897b 100644 --- a/ucm2/codecs/max98090/EnableSeq.conf +++ b/ucm2/codecs/max98090/EnableSeq.conf @@ -1,25 +1,27 @@ -cset "name='Left Speaker Mixer Left DAC Switch' on" -cset "name='Right Speaker Mixer Right DAC Switch' on" -cset "name='Digital EQ 3 Band Switch' off" -cset "name='Digital EQ 5 Band Switch' off" -cset "name='Digital EQ 7 Band Switch' off" -cset "name='Biquad Switch' off" -cset "name='Filter Mode' Music" -cset "name='ADC Oversampling Rate' 0" +EnableSequence [ + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Digital EQ 3 Band Switch' off" + cset "name='Digital EQ 5 Band Switch' off" + cset "name='Digital EQ 7 Band Switch' off" + cset "name='Biquad Switch' off" + cset "name='Filter Mode' Music" + cset "name='ADC Oversampling Rate' 0" -cset "name='DMIC Mux' DMIC" -cset "name='MIC2 Mux' IN34" -cset "name='MIC2 Volume' 10" -cset "name='MIC2 Boost Volume' 0" + cset "name='DMIC Mux' DMIC" + cset "name='MIC2 Mux' IN34" + cset "name='MIC2 Volume' 10" + cset "name='MIC2 Boost Volume' 0" -cset "name='ADCR Boost Volume' 4" -cset "name='ADCL Boost Volume' 4" -cset "name='ADCR Volume' 11" -cset "name='ADCL Volume' 11" + cset "name='ADCR Boost Volume' 4" + cset "name='ADCL Boost Volume' 4" + cset "name='ADCR Volume' 11" + cset "name='ADCL Volume' 11" -cset "name='Headphone Volume' 10" -cset "name='Speaker Volume' 10" + cset "name='Headphone Volume' 10" + cset "name='Speaker Volume' 10" -cset "name='Speaker Left Mixer Volume' 3" -cset "name='Speaker Right Mixer Volume' 3" -cset "name='Playback Path DC Blocking' on" + cset "name='Speaker Left Mixer Volume' 3" + cset "name='Speaker Right Mixer Volume' 3" + cset "name='Playback Path DC Blocking' on" +] diff --git a/ucm2/codecs/nau8824/EnableSeq.conf b/ucm2/codecs/nau8824/EnableSeq.conf index 05f5f0b..433e8e2 100644 --- a/ucm2/codecs/nau8824/EnableSeq.conf +++ b/ucm2/codecs/nau8824/EnableSeq.conf @@ -1,15 +1,17 @@ -# Playback TDM configuration -cset "name='DACL Channel Source' 0" -cset "name='DACR Channel Source' 1" -# Input Configuration -cset "name='DMIC1 Enable Switch' off" -cset "name='DMIC2 Enable Switch' off" -cset "name='DMIC3 Enable Switch' off" -cset "name='DMIC4 Enable Switch' off" -cset "name='MIC1 Volume' 10" -cset "name='MIC2 Volume' 10" -# Button Configuration -cset "name='THD for key media' 10" -cset "name='THD for key voice command' 16" -cset "name='THD for key volume up' 38" -cset "name='THD for key volume down' 115" +EnableSequence [ + # Playback TDM configuration + cset "name='DACL Channel Source' 0" + cset "name='DACR Channel Source' 1" + # Input Configuration + cset "name='DMIC1 Enable Switch' off" + cset "name='DMIC2 Enable Switch' off" + cset "name='DMIC3 Enable Switch' off" + cset "name='DMIC4 Enable Switch' off" + cset "name='MIC1 Volume' 10" + cset "name='MIC2 Volume' 10" + # Button Configuration + cset "name='THD for key media' 10" + cset "name='THD for key voice command' 16" + cset "name='THD for key volume up' 38" + cset "name='THD for key volume down' 115" +] diff --git a/ucm2/codecs/rt5640/EnableSeq.conf b/ucm2/codecs/rt5640/EnableSeq.conf index 62795fa..cbf4038 100644 --- a/ucm2/codecs/rt5640/EnableSeq.conf +++ b/ucm2/codecs/rt5640/EnableSeq.conf @@ -1,41 +1,43 @@ -# RT5640 default output routing -cset "name='OUT MIXL DAC L1 Switch' on" -cset "name='OUT MIXR DAC R1 Switch' on" +EnableSequence [ + # RT5640 default output routing + cset "name='OUT MIXL DAC L1 Switch' on" + cset "name='OUT MIXR DAC R1 Switch' on" -# uncomment for loopback mic->speakers -# cset "name='SPOL MIX BST1 Switch' on" -# cset "name='SPOR MIX BST1 Switch' on" + # uncomment for loopback mic->speakers + # cset "name='SPOL MIX BST1 Switch' on" + # cset "name='SPOR MIX BST1 Switch' on" -# uncomment for loopback playback -> capture -# cset "name='RECMIXL OUT MIXL Switch' on" -# cset "name='RECMIXR OUT MIXR Switch' on" + # uncomment for loopback playback -> capture + # cset "name='RECMIXL OUT MIXL Switch' on" + # cset "name='RECMIXR OUT MIXR Switch' on" -# uncomment to enable swap between AIF1 and AIF2 -# warning: can only work with SSP0 firmware enabled -cset "name='SDI select' 0" -cset "name='DAI select' 0" -#cset "name='SDI select' 1" -#cset "name='DAI select' 1" + # uncomment to enable swap between AIF1 and AIF2 + # warning: can only work with SSP0 firmware enabled + cset "name='SDI select' 0" + cset "name='DAI select' 0" + #cset "name='SDI select' 1" + #cset "name='DAI select' 1" -cset "name='DAC2 Playback Switch' on" -cset "name='DIG MIXL DAC L2 Switch' on" + cset "name='DAC2 Playback Switch' on" + cset "name='DIG MIXL DAC L2 Switch' on" -# Input Configuration -cset "name='Stereo ADC1 Mux' ADC" -cset "name='Stereo ADC2 Mux' DMIC1" -cset "name='Mono ADC L1 Mux' 1" -cset "name='Mono ADC R1 Mux' 1" + # Input Configuration + cset "name='Stereo ADC1 Mux' ADC" + cset "name='Stereo ADC2 Mux' DMIC1" + cset "name='Mono ADC L1 Mux' 1" + cset "name='Mono ADC R1 Mux' 1" -# 47=0dB, 0.375 dB/step, set it to 6 dB to help with soft mics -cset "name='ADC Capture Volume' 63" -# Set ADC Boost Gain to 3dB higher vals result in too much noise -cset "name='ADC Boost Gain' 1" -# Set IN1/IN3 internal mic boost to 8 (max) -# Set IN2 headset-mic boost to 1, headset mics are quite loud -cset "name='IN1 Boost' 8" -cset "name='IN2 Boost' 1" -cset "name='IN3 Boost' 8" + # 47=0dB, 0.375 dB/step, set it to 6 dB to help with soft mics + cset "name='ADC Capture Volume' 63" + # Set ADC Boost Gain to 3dB higher vals result in too much noise + cset "name='ADC Boost Gain' 1" + # Set IN1/IN3 internal mic boost to 8 (max) + # Set IN2 headset-mic boost to 1, headset mics are quite loud + cset "name='IN1 Boost' 8" + cset "name='IN2 Boost' 1" + cset "name='IN3 Boost' 8" -cset "name='Internal Mic Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='ADC Capture Switch' on" + cset "name='Internal Mic Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='ADC Capture Switch' on" +] diff --git a/ucm2/codecs/rt5645/DigitalMicDisableSeq.conf b/ucm2/codecs/rt5645/DigitalMicDisableSeq.conf index 751f38c..227cc3e 100644 --- a/ucm2/codecs/rt5645/DigitalMicDisableSeq.conf +++ b/ucm2/codecs/rt5645/DigitalMicDisableSeq.conf @@ -1,5 +1,7 @@ -cset "name='Sto1 ADC MIXL ADC2 Switch' off" -cset "name='Sto1 ADC MIXR ADC2 Switch' off" -cset "name='Mono ADC MIXL ADC2 Switch' off" -cset "name='Mono ADC MIXR ADC2 Switch' off" -cset "name='Int Mic Switch' off" +DisableSequence [ + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='Mono ADC MIXL ADC2 Switch' off" + cset "name='Mono ADC MIXR ADC2 Switch' off" + cset "name='Int Mic Switch' off" +] diff --git a/ucm2/codecs/rt5645/DigitalMicEnableSeq.conf b/ucm2/codecs/rt5645/DigitalMicEnableSeq.conf index cb243b3..45510ad 100644 --- a/ucm2/codecs/rt5645/DigitalMicEnableSeq.conf +++ b/ucm2/codecs/rt5645/DigitalMicEnableSeq.conf @@ -1,10 +1,12 @@ -cset "name='Int Mic Switch' on" +EnableSequence [ + cset "name='Int Mic Switch' on" -cset "name='Sto1 ADC MIXL ADC1 Switch' off" -cset "name='Sto1 ADC MIXR ADC1 Switch' off" -cset "name='Sto1 ADC MIXL ADC2 Switch' on" -cset "name='Sto1 ADC MIXR ADC2 Switch' on" -cset "name='Mono ADC MIXL ADC1 Switch' off" -cset "name='Mono ADC MIXR ADC1 Switch' off" -cset "name='Mono ADC MIXL ADC2 Switch' on" -cset "name='Mono ADC MIXR ADC2 Switch' on" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Sto1 ADC MIXL ADC2 Switch' on" + cset "name='Sto1 ADC MIXR ADC2 Switch' on" + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXR ADC1 Switch' off" + cset "name='Mono ADC MIXL ADC2 Switch' on" + cset "name='Mono ADC MIXR ADC2 Switch' on" +] diff --git a/ucm2/codecs/rt5645/DisableSeq.conf b/ucm2/codecs/rt5645/DisableSeq.conf index 5127d1a..5726d8a 100644 --- a/ucm2/codecs/rt5645/DisableSeq.conf +++ b/ucm2/codecs/rt5645/DisableSeq.conf @@ -1,15 +1,17 @@ -# Disable audio output path -cset "name='codec_out1 mix 0 pcm0_in Switch' off" -cset "name='media0_out mix 0 media1_in Switch' off" +DisableSequence [ + # Disable audio output path + cset "name='codec_out1 mix 0 pcm0_in Switch' off" + cset "name='media0_out mix 0 media1_in Switch' off" -cset "name='media1_in Gain 0 Switch' off" -cset "name='pcm0_in Gain 0 Switch' off" -cset "name='codec_out1 Gain 0 Switch' off" + cset "name='media1_in Gain 0 Switch' off" + cset "name='pcm0_in Gain 0 Switch' off" + cset "name='codec_out1 Gain 0 Switch' off" -# Disable audio input path -cset "name='pcm1_out mix 0 media_loop2_in Switch' off" -cset "name='media_loop2_out mix 0 codec_in0 Switch' off" + # Disable audio input path + cset "name='pcm1_out mix 0 media_loop2_in Switch' off" + cset "name='media_loop2_out mix 0 codec_in0 Switch' off" -cset "name='media_loop2_out Gain 0 Switch' off" -cset "name='pcm1_out Gain 0 Switch' off" -cset "name='codec_in0 Gain 0 Switch' off" + cset "name='media_loop2_out Gain 0 Switch' off" + cset "name='pcm1_out Gain 0 Switch' off" + cset "name='codec_in0 Gain 0 Switch' off" +]
\ No newline at end of file diff --git a/ucm2/codecs/rt5645/EnableSeq.conf b/ucm2/codecs/rt5645/EnableSeq.conf index d3ad4cf..68fdcbb 100644 --- a/ucm2/codecs/rt5645/EnableSeq.conf +++ b/ucm2/codecs/rt5645/EnableSeq.conf @@ -1,46 +1,48 @@ -# Output Configuration -cset "name='DAC1 L Mux' IF1 DAC" -cset "name='DAC1 R Mux' IF1 DAC" -cset "name='DAC1 MIXL DAC1 Switch' 1" -cset "name='DAC1 MIXR DAC1 Switch' 1" -cset "name='Stereo DAC MIXL DAC L1 Switch' 1" -cset "name='Stereo DAC MIXR DAC R1 Switch' 1" +EnableSequence [ + # Output Configuration + cset "name='DAC1 L Mux' IF1 DAC" + cset "name='DAC1 R Mux' IF1 DAC" + cset "name='DAC1 MIXL DAC1 Switch' 1" + cset "name='DAC1 MIXR DAC1 Switch' 1" + cset "name='Stereo DAC MIXL DAC L1 Switch' 1" + cset "name='Stereo DAC MIXR DAC R1 Switch' 1" -cset "name='DAC L2 Mux' IF2 DAC" -cset "name='DAC R2 Mux' IF2 DAC" -cset "name='Mono DAC MIXL DAC L2 Switch' on" -cset "name='Mono DAC MIXR DAC R2 Switch' on" -cset "name='DAC2 Playback Switch' on" + cset "name='DAC L2 Mux' IF2 DAC" + cset "name='DAC R2 Mux' IF2 DAC" + cset "name='Mono DAC MIXL DAC L2 Switch' on" + cset "name='Mono DAC MIXR DAC R2 Switch' on" + cset "name='DAC2 Playback Switch' on" -cset "name='HPOVOL MIXL DAC1 Switch' on" -cset "name='HPOVOL MIXR DAC1 Switch' on" -cset "name='HPOVOL MIXL DAC2 Switch' on" -cset "name='HPOVOL MIXR DAC2 Switch' on" -cset "name='HPO MIX HPVOL Switch' on" -cset "name='HPOVOL L Switch' on" -cset "name='HPOVOL R Switch' on" + cset "name='HPOVOL MIXL DAC1 Switch' on" + cset "name='HPOVOL MIXR DAC1 Switch' on" + cset "name='HPOVOL MIXL DAC2 Switch' on" + cset "name='HPOVOL MIXR DAC2 Switch' on" + cset "name='HPO MIX HPVOL Switch' on" + cset "name='HPOVOL L Switch' on" + cset "name='HPOVOL R Switch' on" -cset "name='SPK MIXL DAC L1 Switch' on" -cset "name='SPK MIXR DAC R1 Switch' on" -cset "name='SPK MIXL DAC L2 Switch' on" -cset "name='SPK MIXR DAC R2 Switch' on" -cset "name='SPOL MIX SPKVOL L Switch' on" -cset "name='SPOR MIX SPKVOL R Switch' on" -cset "name='SPKVOL L Switch' on" -cset "name='SPKVOL R Switch' on" + cset "name='SPK MIXL DAC L1 Switch' on" + cset "name='SPK MIXR DAC R1 Switch' on" + cset "name='SPK MIXL DAC L2 Switch' on" + cset "name='SPK MIXR DAC R2 Switch' on" + cset "name='SPOL MIX SPKVOL L Switch' on" + cset "name='SPOR MIX SPKVOL R Switch' on" + cset "name='SPKVOL L Switch' on" + cset "name='SPKVOL R Switch' on" -# Input Configuration -cset "name='Stereo1 DMIC Mux' 0" -cset "name='Stereo1 ADC2 Mux' 1" -cset "name='ADC Capture Switch' on" + # Input Configuration + cset "name='Stereo1 DMIC Mux' 0" + cset "name='Stereo1 ADC2 Mux' 1" + cset "name='ADC Capture Switch' on" -# 55/63 -cset "name='ADC Capture Volume' 55" -# set ADC Boost to 0/3, higher vals cause a lot of white noise -cset "name='ADC Boost Capture Volume' 0" -# 55/63 -cset "name='Mono ADC Capture Volume' 55" -# 0/3 -cset "name='Mono ADC Boost Capture Volume' 0" -# 27/31 -cset "name='IN Capture Volume' 27" + # 55/63 + cset "name='ADC Capture Volume' 55" + # set ADC Boost to 0/3, higher vals cause a lot of white noise + cset "name='ADC Boost Capture Volume' 0" + # 55/63 + cset "name='Mono ADC Capture Volume' 55" + # 0/3 + cset "name='Mono ADC Boost Capture Volume' 0" + # 27/31 + cset "name='IN Capture Volume' 27" +]
\ No newline at end of file diff --git a/ucm2/codecs/rt5645/HSMicDisableSeq.conf b/ucm2/codecs/rt5645/HSMicDisableSeq.conf index ef42b17..d694423 100644 --- a/ucm2/codecs/rt5645/HSMicDisableSeq.conf +++ b/ucm2/codecs/rt5645/HSMicDisableSeq.conf @@ -1,6 +1,8 @@ -cset "name='Headset Mic Switch' off" +DisableSequence [ + cset "name='Headset Mic Switch' off" -cset "name='RECMIXL BST1 Switch' off" -cset "name='RECMIXR BST1 Switch' off" -cset "name='Sto1 ADC MIXL ADC1 Switch' off" -cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" +] diff --git a/ucm2/codecs/rt5645/HSMicEnableSeq.conf b/ucm2/codecs/rt5645/HSMicEnableSeq.conf index 6c26d68..cf80637 100644 --- a/ucm2/codecs/rt5645/HSMicEnableSeq.conf +++ b/ucm2/codecs/rt5645/HSMicEnableSeq.conf @@ -1,7 +1,9 @@ -cset "name='Headset Mic Switch' on" +EnableSequence [ + cset "name='Headset Mic Switch' on" -cset "name='Sto1 ADC MIXL ADC1 Switch' on" -cset "name='Sto1 ADC MIXR ADC1 Switch' on" + cset "name='Sto1 ADC MIXL ADC1 Switch' on" + cset "name='Sto1 ADC MIXR ADC1 Switch' on" -cset "name='RECMIXL BST1 Switch' on" -cset "name='RECMIXR BST1 Switch' on" + cset "name='RECMIXL BST1 Switch' on" + cset "name='RECMIXR BST1 Switch' on" +] diff --git a/ucm2/codecs/rt5645/HeadphonesEnableSeq.conf b/ucm2/codecs/rt5645/HeadphonesEnableSeq.conf index 6c231da..4406d5a 100644 --- a/ucm2/codecs/rt5645/HeadphonesEnableSeq.conf +++ b/ucm2/codecs/rt5645/HeadphonesEnableSeq.conf @@ -1,7 +1,9 @@ -cset "name='Ext Spk Switch' off" -cset "name='Speaker Channel Switch' off" +EnableSequence [ + cset "name='Ext Spk Switch' off" + cset "name='Speaker Channel Switch' off" -cset "name='Headphone Switch' on" -cset "name='Headphone Channel Switch' on" -# 25/39 higher values cause crackling on some boards -cset "name='Headphone Playback Volume' 25" + cset "name='Headphone Switch' on" + cset "name='Headphone Channel Switch' on" + # 25/39 higher values cause crackling on some boards + cset "name='Headphone Playback Volume' 25" +] diff --git a/ucm2/codecs/rt5645/SpeakerEnableSeq.conf b/ucm2/codecs/rt5645/SpeakerEnableSeq.conf index 2cc62fc..7b91387 100644 --- a/ucm2/codecs/rt5645/SpeakerEnableSeq.conf +++ b/ucm2/codecs/rt5645/SpeakerEnableSeq.conf @@ -1,6 +1,8 @@ -cset "name='Headphone Switch' off" -cset "name='Headphone Channel Switch' off" +EnableSequence [ + cset "name='Headphone Switch' off" + cset "name='Headphone Channel Switch' off" -cset "name='Ext Spk Switch' on" -cset "name='Speaker Channel Switch' on" -cset "name='Speaker Playback Volume' 31" + cset "name='Ext Spk Switch' on" + cset "name='Speaker Channel Switch' on" + cset "name='Speaker Playback Volume' 31" +] diff --git a/ucm2/codecs/rt5651/EnableSeq.conf b/ucm2/codecs/rt5651/EnableSeq.conf index 9c1386f..3d30e15 100644 --- a/ucm2/codecs/rt5651/EnableSeq.conf +++ b/ucm2/codecs/rt5651/EnableSeq.conf @@ -1,56 +1,59 @@ -# default state -cset "name='HPO MIX DAC1 Switch' on" -cset "name='HPO MIX HPVOL Switch' off" -cset "name='HPO L Playback Switch' off" -cset "name='HPO R Playback Switch' off" -cset "name='HPOVOL L Switch' on" -cset "name='HPOVOL R Switch' on" -cset "name='LOUT MIX DAC L1 Switch' on" -cset "name='LOUT MIX DAC R1 Switch' on" -cset "name='IF1 ASRC Switch' on" -cset "name='LOUT L Playback Switch' off" -cset "name='LOUT R Playback Switch' off" -cset "name='Stereo DAC MIXL DAC L1 Switch' on" -cset "name='Stereo DAC MIXL DAC R1 Switch' off" -cset "name='Stereo DAC MIXR DAC L1 Switch' off" -cset "name='Stereo DAC MIXR DAC R1 Switch' on" -cset "name='Stereo1 ADC MIXL ADC1 Switch' off" -cset "name='Stereo1 ADC MIXR ADC1 Switch' off" -cset "name='Stereo1 ADC MIXL ADC2 Switch' off" -cset "name='Stereo1 ADC MIXR ADC2 Switch' off" -cset "name='Stereo2 ADC MIXL ADC1 Switch' off" -cset "name='Stereo2 ADC MIXR ADC1 Switch' off" -cset "name='Stereo2 ADC MIXL ADC2 Switch' off" -cset "name='Stereo2 ADC MIXR ADC2 Switch' off" -cset "name='Headphone Switch' off" -cset "name='Speaker Switch' off" +EnableSequence [ -# volumes -cset "name='OUT Playback Volume' 31" -cset "name='HP Playback Volume' 31" -cset "name='DAC1 Playback Volume' 175" -cset "name='IN Capture Volume' 23" -# 47=0dB, 0.375 dB/step, set it to 6 dB to help with soft mics -cset "name='ADC Capture Volume' 63" -cset "name='ADC Capture Switch' on" -# Set ADC Boost Gain to 3dB higher vals result in too much noise -cset "name='ADC Boost Gain' 1" -# Set IN1, IN2 and IN3 internal mic boost to 1 -cset "name='IN1 Boost' 1" -cset "name='IN2 Boost' 1" -cset "name='IN3 Boost' 1" + # default state + cset "name='HPO MIX DAC1 Switch' on" + cset "name='HPO MIX HPVOL Switch' off" + cset "name='HPO L Playback Switch' off" + cset "name='HPO R Playback Switch' off" + cset "name='HPOVOL L Switch' on" + cset "name='HPOVOL R Switch' on" + cset "name='LOUT MIX DAC L1 Switch' on" + cset "name='LOUT MIX DAC R1 Switch' on" + cset "name='IF1 ASRC Switch' on" + cset "name='LOUT L Playback Switch' off" + cset "name='LOUT R Playback Switch' off" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXL DAC R1 Switch' off" + cset "name='Stereo DAC MIXR DAC L1 Switch' off" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo1 ADC MIXL ADC1 Switch' off" + cset "name='Stereo1 ADC MIXR ADC1 Switch' off" + cset "name='Stereo1 ADC MIXL ADC2 Switch' off" + cset "name='Stereo1 ADC MIXR ADC2 Switch' off" + cset "name='Stereo2 ADC MIXL ADC1 Switch' off" + cset "name='Stereo2 ADC MIXR ADC1 Switch' off" + cset "name='Stereo2 ADC MIXL ADC2 Switch' off" + cset "name='Stereo2 ADC MIXR ADC2 Switch' off" + cset "name='Headphone Switch' off" + cset "name='Speaker Switch' off" -# input -cset "name='Stereo1 ADC L1 Mux' ADC" -cset "name='Stereo1 ADC R1 Mux' ADC" -cset "name='Stereo1 ADC L2 Mux' DMIC" -cset "name='Stereo1 ADC R2 Mux' DMIC" -cset "name='RECMIXL BST1 Switch' off" -cset "name='RECMIXR BST1 Switch' off" -cset "name='RECMIXL BST3 Switch' off" -cset "name='RECMIXR BST3 Switch' off" -cset "name='RECMIXL BST2 Switch' off" -cset "name='RECMIXR BST2 Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='Internal Mic Switch' off" -cset "name='Line In Switch' off" + # volumes + cset "name='OUT Playback Volume' 31" + cset "name='HP Playback Volume' 31" + cset "name='DAC1 Playback Volume' 175" + cset "name='IN Capture Volume' 23" + # 47=0dB, 0.375 dB/step, set it to 6 dB to help with soft mics + cset "name='ADC Capture Volume' 63" + cset "name='ADC Capture Switch' on" + # Set ADC Boost Gain to 3dB higher vals result in too much noise + cset "name='ADC Boost Gain' 1" + # Set IN1, IN2 and IN3 internal mic boost to 1 + cset "name='IN1 Boost' 1" + cset "name='IN2 Boost' 1" + cset "name='IN3 Boost' 1" + + # input + cset "name='Stereo1 ADC L1 Mux' ADC" + cset "name='Stereo1 ADC R1 Mux' ADC" + cset "name='Stereo1 ADC L2 Mux' DMIC" + cset "name='Stereo1 ADC R2 Mux' DMIC" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='RECMIXL BST3 Switch' off" + cset "name='RECMIXR BST3 Switch' off" + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Internal Mic Switch' off" + cset "name='Line In Switch' off" +] diff --git a/ucm2/codecs/rt5672/EnableSeq.conf b/ucm2/codecs/rt5672/EnableSeq.conf index bd4f357..a19a982 100644 --- a/ucm2/codecs/rt5672/EnableSeq.conf +++ b/ucm2/codecs/rt5672/EnableSeq.conf @@ -1,48 +1,50 @@ -# Playback (I2S1) +EnableSequence [ + # Playback (I2S1) -# common -cset "name='DAC1 L Mux' IF1 DAC" -cset "name='DAC1 R Mux' IF1 DAC" -cset "name='DAC1 MIXL DAC1 Switch' on" -cset "name='DAC1 MIXR DAC1 Switch' on" -cset "name='Stereo DAC MIXL DAC L1 Switch' on" -cset "name='Stereo DAC MIXL DAC R1 Switch' off" -cset "name='Stereo DAC MIXR DAC R1 Switch' on" -cset "name='Stereo DAC MIXR DAC L1 Switch' off" + # common + cset "name='DAC1 L Mux' IF1 DAC" + cset "name='DAC1 R Mux' IF1 DAC" + cset "name='DAC1 MIXL DAC1 Switch' on" + cset "name='DAC1 MIXR DAC1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXL DAC R1 Switch' off" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo DAC MIXR DAC L1 Switch' off" -# speaker -cset "name='PDM1 L Mux' Stereo DAC" -cset "name='PDM1 R Mux' Stereo DAC" + # speaker + cset "name='PDM1 L Mux' Stereo DAC" + cset "name='PDM1 R Mux' Stereo DAC" -# headphone -cset "name='HPOVOL MIXL DAC1 Switch' on" -cset "name='HPOVOL MIXR DAC1 Switch' on" -cset "name='HPO MIX HPVOL Switch' on" + # headphone + cset "name='HPOVOL MIXL DAC1 Switch' on" + cset "name='HPOVOL MIXR DAC1 Switch' on" + cset "name='HPO MIX HPVOL Switch' on" -# line out -# cset "name='OUT MIXL DAC L1 Switch' on" -# cset "name='OUT MIXR DAC R1 Switch' on" -# cset "name='LOUT MIX OUTMIX L Switch' on" -# cset "name='LOUT MIX OUTMIX R Switch' on" + # line out + # cset "name='OUT MIXL DAC L1 Switch' on" + # cset "name='OUT MIXR DAC R1 Switch' on" + # cset "name='LOUT MIX OUTMIX L Switch' on" + # cset "name='LOUT MIX OUTMIX R Switch' on" -# 47=0dB, 0.375 dB/step -cset "name='ADC Capture Volume' 47" -cset "name='ADC Capture Switch' on" + # 47=0dB, 0.375 dB/step + cset "name='ADC Capture Volume' 47" + cset "name='ADC Capture Switch' on" -# Headset mic is quite soft, boost it a bit, 1 = 20dB which is the first -# available boost step -cset "name='IN1 Boost Volume' 1" + # Headset mic is quite soft, boost it a bit, 1 = 20dB which is the first + # available boost step + cset "name='IN1 Boost Volume' 1" -# Start with all outputs / inputs disabled -cset "name='Ext Spk Switch' off" -cset "name='Headphone Switch' off" -cset "name='Int Mic Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='Sto1 ADC MIXL ADC1 Switch' off" -cset "name='Sto1 ADC MIXR ADC1 Switch' off" -cset "name='Sto1 ADC MIXL ADC2 Switch' off" -cset "name='Sto1 ADC MIXR ADC2 Switch' off" -cset "name='RECMIXL BST1 Switch' off" -cset "name='RECMIXR BST1 Switch' off" -cset "name='RECMIXL BST2 Switch' off" -cset "name='RECMIXR BST2 Switch' off" + # Start with all outputs / inputs disabled + cset "name='Ext Spk Switch' off" + cset "name='Headphone Switch' off" + cset "name='Int Mic Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" +] diff --git a/ucm2/codecs/wcd934x/DefaultDisableSeq.conf b/ucm2/codecs/wcd934x/DefaultDisableSeq.conf index 88d82a3..9df1664 100644 --- a/ucm2/codecs/wcd934x/DefaultDisableSeq.conf +++ b/ucm2/codecs/wcd934x/DefaultDisableSeq.conf @@ -1,5 +1,7 @@ -cset "name='RX INT7_1 MIX1 INP0' ZERO" -cset "name='RX INT8_1 MIX1 INP0' ZERO" -cset "name='RX INT1_2 MUX' ZERO" -cset "name='RX INT2_2 MUX' ZERO" -cset "name='CDC_IF TX0 MUX' ZERO" +DisableSequence [ + cset "name='RX INT7_1 MIX1 INP0' ZERO" + cset "name='RX INT8_1 MIX1 INP0' ZERO" + cset "name='RX INT1_2 MUX' ZERO" + cset "name='RX INT2_2 MUX' ZERO" + cset "name='CDC_IF TX0 MUX' ZERO" +] diff --git a/ucm2/codecs/wcd934x/DefaultEnableSeq.conf b/ucm2/codecs/wcd934x/DefaultEnableSeq.conf index e5bdbbd..4b6f3e7 100644 --- a/ucm2/codecs/wcd934x/DefaultEnableSeq.conf +++ b/ucm2/codecs/wcd934x/DefaultEnableSeq.conf @@ -1,14 +1,16 @@ -cset "name='SLIM RX1 MUX' AIF1_PB" -cset "name='SLIM RX2 MUX' AIF1_PB" -cset "name='SLIM RX6 MUX' ZERO" -cset "name='SLIM RX7 MUX' ZERO" -cset "name='SLIM RX3 MUX' ZERO" -cset "name='SLIM RX4 MUX' ZERO" -cset "name='SLIM RX5 MUX' ZERO" -cset "name='AIF1_CAP Mixer SLIM TX0' 1" +EnableSequence [ + cset "name='SLIM RX1 MUX' AIF1_PB" + cset "name='SLIM RX2 MUX' AIF1_PB" + cset "name='SLIM RX6 MUX' ZERO" + cset "name='SLIM RX7 MUX' ZERO" + cset "name='SLIM RX3 MUX' ZERO" + cset "name='SLIM RX4 MUX' ZERO" + cset "name='SLIM RX5 MUX' ZERO" + cset "name='AIF1_CAP Mixer SLIM TX0' 1" -cset "name='RX INT7_1 MIX1 INP0' RX1" -cset "name='RX INT8_1 MIX1 INP0' RX2" -cset "name='RX INT1_2 MUX' RX1" -cset "name='RX INT2_2 MUX' RX2" -cset "name='CDC_IF TX0 MUX' DEC0" + cset "name='RX INT7_1 MIX1 INP0' RX1" + cset "name='RX INT8_1 MIX1 INP0' RX2" + cset "name='RX INT1_2 MUX' RX1" + cset "name='RX INT2_2 MUX' RX2" + cset "name='CDC_IF TX0 MUX' DEC0" +] diff --git a/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf b/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf index 3c977c8..92f9dea 100644 --- a/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf +++ b/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf @@ -1,4 +1,6 @@ -cset "name='RX7 Digital Volume' 0" -cset "name='RX8 Digital Volume' 0" -cset "name='COMP7 Switch' 0" -cset "name='COMP8 Switch' 0" +DisableSequence [ + cset "name='RX7 Digital Volume' 0" + cset "name='RX8 Digital Volume' 0" + cset "name='COMP7 Switch' 0" + cset "name='COMP8 Switch' 0" +]
\ No newline at end of file diff --git a/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf b/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf index 2d9a3d8..2d8d01a 100644 --- a/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf +++ b/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf @@ -1,4 +1,6 @@ -cset "name='COMP7 Switch' 1" -cset "name='COMP8 Switch' 1" -cset "name='RX7 Digital Volume' 80" -cset "name='RX8 Digital Volume' 80" +EnableSequence [ + cset "name='COMP7 Switch' 1" + cset "name='COMP8 Switch' 1" + cset "name='RX7 Digital Volume' 80" + cset "name='RX8 Digital Volume' 80" +] diff --git a/ucm2/codecs/wsa881x/DefaultEnableSeq.conf b/ucm2/codecs/wsa881x/DefaultEnableSeq.conf index 499342b..98310a9 100644 --- a/ucm2/codecs/wsa881x/DefaultEnableSeq.conf +++ b/ucm2/codecs/wsa881x/DefaultEnableSeq.conf @@ -1,8 +1,10 @@ -cset "name='SpkrLeft COMP Switch' 1" -cset "name='SpkrLeft BOOST Switch' 1" -cset "name='SpkrLeft DAC Switch' 1" -cset "name='SpkrLeft VISENSE Switch' 0" -cset "name='SpkrRight COMP Switch' 1" -cset "name='SpkrRight BOOST Switch' 1" -cset "name='SpkrRight DAC Switch' 1" -cset "name='SpkrRight VISENSE Switch' 0" +EnableSequence [ + cset "name='SpkrLeft COMP Switch' 1" + cset "name='SpkrLeft BOOST Switch' 1" + cset "name='SpkrLeft DAC Switch' 1" + cset "name='SpkrLeft VISENSE Switch' 0" + cset "name='SpkrRight COMP Switch' 1" + cset "name='SpkrRight BOOST Switch' 1" + cset "name='SpkrRight DAC Switch' 1" + cset "name='SpkrRight VISENSE Switch' 0" +] diff --git a/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf b/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf index 9614422..9439eb8 100644 --- a/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf +++ b/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf @@ -1,8 +1,10 @@ -cset "name='SpkrLeft COMP Switch' 0" -cset "name='SpkrLeft BOOST Switch' 0" -cset "name='SpkrLeft DAC Switch' 0" -cset "name='SpkrLeft VISENSE Switch' 0" -cset "name='SpkrRight COMP Switch' 0" -cset "name='SpkrRight BOOST Switch' 0" -cset "name='SpkrRight DAC Switch' 0" -cset "name='SpkrRight VISENSE Switch' 0" +DisableSequence [ + cset "name='SpkrLeft COMP Switch' 0" + cset "name='SpkrLeft BOOST Switch' 0" + cset "name='SpkrLeft DAC Switch' 0" + cset "name='SpkrLeft VISENSE Switch' 0" + cset "name='SpkrRight COMP Switch' 0" + cset "name='SpkrRight BOOST Switch' 0" + cset "name='SpkrRight DAC Switch' 0" + cset "name='SpkrRight VISENSE Switch' 0" +] diff --git a/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf b/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf index 31c27f3..72a02ec 100644 --- a/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf +++ b/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf @@ -1,10 +1,12 @@ -cset "name='SpkrLeft COMP Switch' 1" -cset "name='SpkrLeft BOOST Switch' 1" -cset "name='SpkrLeft DAC Switch' 1" -cset "name='SpkrLeft VISENSE Switch' 0" -cset "name='SpkrLeft PA Volume' 12" -cset "name='SpkrRight COMP Switch' 1" -cset "name='SpkrRight BOOST Switch' 1" -cset "name='SpkrRight DAC Switch' 1" -cset "name='SpkrRight VISENSE Switch' 0" -cset "name='SpkrRight PA Volume' 12" +EnableSequence [ + cset "name='SpkrLeft COMP Switch' 1" + cset "name='SpkrLeft BOOST Switch' 1" + cset "name='SpkrLeft DAC Switch' 1" + cset "name='SpkrLeft VISENSE Switch' 0" + cset "name='SpkrLeft PA Volume' 12" + cset "name='SpkrRight COMP Switch' 1" + cset "name='SpkrRight BOOST Switch' 1" + cset "name='SpkrRight DAC Switch' 1" + cset "name='SpkrRight VISENSE Switch' 0" + cset "name='SpkrRight PA Volume' 12" +] diff --git a/ucm2/hda-dsp/HiFi.conf b/ucm2/hda-dsp/HiFi.conf index cdeb215..c274b37 100644 --- a/ucm2/hda-dsp/HiFi.conf +++ b/ucm2/hda-dsp/HiFi.conf @@ -92,5 +92,5 @@ SectionDevice."Mic" { } } -<hda-dsp/Hdmi1.conf> -<hda-dsp/Hdmi2.conf> +Include.hdmi1.File "Hdmi1.conf" +Include.hdmi2.File "Hdmi2.conf" diff --git a/ucm2/hda-dsp/hda-dsp.conf b/ucm2/hda-dsp/hda-dsp.conf index bf80b09..2434f4d 100644 --- a/ucm2/hda-dsp/hda-dsp.conf +++ b/ucm2/hda-dsp/hda-dsp.conf @@ -1,7 +1,7 @@ # UCM for Intel CAVS platforms # For Audio in HDA and DMIC mode -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/platforms/bytcr/PlatformDisableSeq.conf b/ucm2/platforms/bytcr/PlatformDisableSeq.conf index 9bb018b..cd48dc0 100644 --- a/ucm2/platforms/bytcr/PlatformDisableSeq.conf +++ b/ucm2/platforms/bytcr/PlatformDisableSeq.conf @@ -1,20 +1,23 @@ # disable audio output path -cset "name='codec_out0 mix 0 pcm0_in Switch' off" -cset "name='modem_out mix 0 pcm0_in Switch' off" -cset "name='media0_out mix 0 media0_in Switch' off" -cset "name='media0_out mix 0 media1_in Switch' off" -cset "name='media0_out mix 0 media3_in Switch' off" +DisableSequence [ + cset "name='codec_out0 mix 0 pcm0_in Switch' off" + cset "name='modem_out mix 0 pcm0_in Switch' off" -cset "name='media0_in Gain 0 Switch' off" -cset "name='media1_in Gain 0 Switch' off" -cset "name='media3_in Gain 0 Switch' off" + cset "name='media0_out mix 0 media0_in Switch' off" + cset "name='media0_out mix 0 media1_in Switch' off" + cset "name='media0_out mix 0 media3_in Switch' off" -cset "name='pcm0_in Gain 0 Switch' off" -cset "name='codec_out0 Gain 0 Switch' off" -cset "name='modem_out Gain 0 Switch' off" + cset "name='media0_in Gain 0 Switch' off" + cset "name='media1_in Gain 0 Switch' off" + cset "name='media3_in Gain 0 Switch' off" -# disable audio input path -cset "name='pcm1_out Gain 0 Switch' off" -cset "name='codec_in0 Gain 0 Switch' off" -cset "name='modem_in Gain 0 Switch' off" + cset "name='pcm0_in Gain 0 Switch' off" + cset "name='codec_out0 Gain 0 Switch' off" + cset "name='modem_out Gain 0 Switch' off" + + # disable audio input path + cset "name='pcm1_out Gain 0 Switch' off" + cset "name='codec_in0 Gain 0 Switch' off" + cset "name='modem_in Gain 0 Switch' off" +] diff --git a/ucm2/platforms/bytcr/PlatformEnableSeq.conf b/ucm2/platforms/bytcr/PlatformEnableSeq.conf index b5ee2b4..65de7c2 100644 --- a/ucm2/platforms/bytcr/PlatformEnableSeq.conf +++ b/ucm2/platforms/bytcr/PlatformEnableSeq.conf @@ -1,115 +1,118 @@ -# media mixer settings -# compress -cset "name='media0_in Gain 0 Switch' on" -cset "name='media0_in Gain 0 Volume' 0" - -# normal -cset "name='media1_in Gain 0 Switch' on" -cset "name='media1_in Gain 0 Volume' 0" -# swm loopback -cset "name='media2_in Gain 0 Switch' off" -cset "name='media2_in Gain 0 Volume' 0%" -# deep buffer -cset "name='media3_in Gain 0 Switch' on" -cset "name='media3_in Gain 0 Volume' 0" - -cset "name='media0_out mix 0 media0_in Switch' on" -cset "name='media0_out mix 0 media1_in Switch' on" -cset "name='media0_out mix 0 media2_in Switch' off" -cset "name='media0_out mix 0 media3_in Switch' on" - -cset "name='media1_out mix 0 media0_in Switch' off" -cset "name='media1_out mix 0 media1_in Switch' off" -cset "name='media1_out mix 0 media2_in Switch' off" -cset "name='media1_out mix 0 media3_in Switch' off" - -cset "name='pcm0_in Gain 0 Switch' on" -cset "name='pcm0_in Gain 0 Volume' 0" - -cset "name='pcm1_in Gain 0 Switch' off" -cset "name='pcm1_in Gain 0 Volume' 0%" - -# codec0_out settings (used if SSP2 is connected) -cset "name='codec_out0 mix 0 codec_in0 Switch' off" -cset "name='codec_out0 mix 0 codec_in1 Switch' off" -cset "name='codec_out0 mix 0 media_loop1_in Switch' off" -cset "name='codec_out0 mix 0 media_loop2_in Switch' off" -cset "name='codec_out0 mix 0 pcm0_in Switch' on" -cset "name='codec_out0 mix 0 pcm1_in Switch' off" -cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" -cset "name='codec_out0 Gain 0 Switch' on" -cset "name='codec_out0 Gain 0 Volume' 0" - -# modem_out settings (used if SSP0 is connected) -cset "name='modem_out mix 0 codec_in0 Switch' off" -cset "name='modem_out mix 0 codec_in1 Switch' off" -cset "name='modem_out mix 0 media_loop1_in Switch' off" -cset "name='modem_out mix 0 media_loop2_in Switch' off" -cset "name='modem_out mix 0 pcm0_in Switch' on" -cset "name='modem_out mix 0 pcm1_in Switch' off" -cset "name='modem_out mix 0 sprot_loop_in Switch' off" -cset "name='modem_out Gain 0 Switch' on" -cset "name='modem_out Gain 0 Volume' 0" - -# input settings - -# input used when SSP2 is connected -cset "name='codec_in0 Gain 0 Switch' on" -cset "name='codec_in0 Gain 0 Volume' 0" - -# input used when SSP0 is connected -cset "name='modem_in Gain 0 Switch' on" -cset "name='modem_in Gain 0 Volume' 0" - -# pcm1_out settings -cset "name='pcm1_out mix 0 codec_in0 Switch' on" -cset "name='pcm1_out mix 0 modem_in Switch' on" -cset "name='pcm1_out mix 0 codec_in1 Switch' off" -cset "name='pcm1_out mix 0 media_loop1_in Switch' off" -cset "name='pcm1_out mix 0 media_loop2_in Switch' off" -cset "name='pcm1_out mix 0 pcm0_in Switch' off" -cset "name='pcm1_out mix 0 pcm1_in Switch' off" -cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" - -cset "name='pcm1_out Gain 0 Switch' on" -cset "name='pcm1_out Gain 0 Volume' 0" - -# disable codec_out1 -cset "name='codec_out1 mix 0 codec_in0 Switch' off" -cset "name='codec_out1 mix 0 codec_in1 Switch' off" -cset "name='codec_out1 mix 0 media_loop1_in Switch' off" -cset "name='codec_out1 mix 0 media_loop2_in Switch' off" -cset "name='codec_out1 mix 0 pcm0_in Switch' off" -cset "name='codec_out1 mix 0 pcm1_in Switch' off" -cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" -cset "name='codec_out1 Gain 0 Switch' off" -cset "name='codec_out1 Gain 0 Volume' 0%" - -# disable codec_in1 -cset "name='codec_in1 Gain 0 Switch' off" -cset "name='codec_in1 Gain 0 Volume' 0%" - -# disable all loops -cset "name='media_loop1_out mix 0 codec_in0 Switch' off" -cset "name='media_loop1_out mix 0 codec_in1 Switch' off" -cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" -cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" -cset "name='media_loop1_out mix 0 pcm0_in Switch' off" -cset "name='media_loop1_out mix 0 pcm1_in Switch' off" -cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" - -cset "name='media_loop2_out mix 0 codec_in0 Switch' off" -cset "name='media_loop2_out mix 0 codec_in1 Switch' off" -cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" -cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" -cset "name='media_loop2_out mix 0 pcm0_in Switch' off" -cset "name='media_loop2_out mix 0 pcm1_in Switch' off" -cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" - -cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" -cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" -cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" -cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" -cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" -cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" -cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" +EnableSequence [ + + # media mixer settings + # compress + cset "name='media0_in Gain 0 Switch' on" + cset "name='media0_in Gain 0 Volume' 0" + + # normal + cset "name='media1_in Gain 0 Switch' on" + cset "name='media1_in Gain 0 Volume' 0" + # swm loopback + cset "name='media2_in Gain 0 Switch' off" + cset "name='media2_in Gain 0 Volume' 0%" + # deep buffer + cset "name='media3_in Gain 0 Switch' on" + cset "name='media3_in Gain 0 Volume' 0" + + cset "name='media0_out mix 0 media0_in Switch' on" + cset "name='media0_out mix 0 media1_in Switch' on" + cset "name='media0_out mix 0 media2_in Switch' off" + cset "name='media0_out mix 0 media3_in Switch' on" + + cset "name='media1_out mix 0 media0_in Switch' off" + cset "name='media1_out mix 0 media1_in Switch' off" + cset "name='media1_out mix 0 media2_in Switch' off" + cset "name='media1_out mix 0 media3_in Switch' off" + + cset "name='pcm0_in Gain 0 Switch' on" + cset "name='pcm0_in Gain 0 Volume' 0" + + cset "name='pcm1_in Gain 0 Switch' off" + cset "name='pcm1_in Gain 0 Volume' 0%" + + # codec0_out settings (used if SSP2 is connected) + cset "name='codec_out0 mix 0 codec_in0 Switch' off" + cset "name='codec_out0 mix 0 codec_in1 Switch' off" + cset "name='codec_out0 mix 0 media_loop1_in Switch' off" + cset "name='codec_out0 mix 0 media_loop2_in Switch' off" + cset "name='codec_out0 mix 0 pcm0_in Switch' on" + cset "name='codec_out0 mix 0 pcm1_in Switch' off" + cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" + cset "name='codec_out0 Gain 0 Switch' on" + cset "name='codec_out0 Gain 0 Volume' 0" + + # modem_out settings (used if SSP0 is connected) + cset "name='modem_out mix 0 codec_in0 Switch' off" + cset "name='modem_out mix 0 codec_in1 Switch' off" + cset "name='modem_out mix 0 media_loop1_in Switch' off" + cset "name='modem_out mix 0 media_loop2_in Switch' off" + cset "name='modem_out mix 0 pcm0_in Switch' on" + cset "name='modem_out mix 0 pcm1_in Switch' off" + cset "name='modem_out mix 0 sprot_loop_in Switch' off" + cset "name='modem_out Gain 0 Switch' on" + cset "name='modem_out Gain 0 Volume' 0" + + # input settings + + # input used when SSP2 is connected + cset "name='codec_in0 Gain 0 Switch' on" + cset "name='codec_in0 Gain 0 Volume' 0" + + # input used when SSP0 is connected + cset "name='modem_in Gain 0 Switch' on" + cset "name='modem_in Gain 0 Volume' 0" + + # pcm1_out settings + cset "name='pcm1_out mix 0 codec_in0 Switch' on" + cset "name='pcm1_out mix 0 modem_in Switch' on" + cset "name='pcm1_out mix 0 codec_in1 Switch' off" + cset "name='pcm1_out mix 0 media_loop1_in Switch' off" + cset "name='pcm1_out mix 0 media_loop2_in Switch' off" + cset "name='pcm1_out mix 0 pcm0_in Switch' off" + cset "name='pcm1_out mix 0 pcm1_in Switch' off" + cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" + + cset "name='pcm1_out Gain 0 Switch' on" + cset "name='pcm1_out Gain 0 Volume' 0" + + # disable codec_out1 + cset "name='codec_out1 mix 0 codec_in0 Switch' off" + cset "name='codec_out1 mix 0 codec_in1 Switch' off" + cset "name='codec_out1 mix 0 media_loop1_in Switch' off" + cset "name='codec_out1 mix 0 media_loop2_in Switch' off" + cset "name='codec_out1 mix 0 pcm0_in Switch' off" + cset "name='codec_out1 mix 0 pcm1_in Switch' off" + cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" + cset "name='codec_out1 Gain 0 Switch' off" + cset "name='codec_out1 Gain 0 Volume' 0%" + + # disable codec_in1 + cset "name='codec_in1 Gain 0 Switch' off" + cset "name='codec_in1 Gain 0 Volume' 0%" + + # disable all loops + cset "name='media_loop1_out mix 0 codec_in0 Switch' off" + cset "name='media_loop1_out mix 0 codec_in1 Switch' off" + cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" + cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" + cset "name='media_loop1_out mix 0 pcm0_in Switch' off" + cset "name='media_loop1_out mix 0 pcm1_in Switch' off" + cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" + + cset "name='media_loop2_out mix 0 codec_in0 Switch' off" + cset "name='media_loop2_out mix 0 codec_in1 Switch' off" + cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" + cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" + cset "name='media_loop2_out mix 0 pcm0_in Switch' off" + cset "name='media_loop2_out mix 0 pcm1_in Switch' off" + cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" + + cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" + cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" + cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" + cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" + cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" + cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" + cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" +] diff --git a/ucm2/skylake-rt286/HiFi.conf b/ucm2/skylake-rt286/HiFi.conf index ed4bfa7..ac50062 100644 --- a/ucm2/skylake-rt286/HiFi.conf +++ b/ucm2/skylake-rt286/HiFi.conf @@ -108,5 +108,5 @@ SectionDevice."Mic" { } } -<skylake-rt286/Hdmi1.conf> -<skylake-rt286/Hdmi2.conf> +Include.hdmi1.File "/skylake-rt286/Hdmi1.conf" +Include.hdmi2.File "/skylake-rt286/Hdmi2.conf" diff --git a/ucm2/skylake-rt286/skylake-rt286.conf b/ucm2/skylake-rt286/skylake-rt286.conf index 97f2a7c..5e6165f 100644 --- a/ucm2/skylake-rt286/skylake-rt286.conf +++ b/ucm2/skylake-rt286/skylake-rt286.conf @@ -1,7 +1,7 @@ # UCM for Intel SKYLAKE/KABYLAKE platforms # For Audio in I2S mode -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf index eea6ed9..3b54d4a 100644 --- a/ucm2/sof-hda-dsp/HiFi.conf +++ b/ucm2/sof-hda-dsp/HiFi.conf @@ -108,7 +108,7 @@ If.monomic { Value { CapturePriority 200 - <sof-hda-dsp/HDA-Capture-value.conf> + Include.value.File "HDA-Capture-value.conf" JackControl "Headphone Mic Jack" } } @@ -122,7 +122,7 @@ If.monomic { Value { CapturePriority 300 - <sof-hda-dsp/HDA-Capture-value.conf> + Include.value.File "HDA-Capture-value.conf" JackControl "Headphone Mic Jack" } } @@ -133,7 +133,7 @@ If.monomic { Value { CapturePriority 200 - <sof-hda-dsp/HDA-Capture-value.conf> + Include.value.File "HDA-Capture-value.conf" JackControl "Mic Jack" } } @@ -175,4 +175,4 @@ SectionDevice."Mic1" { } } -<sof-hda-dsp/Hdmi.conf> +Include.hdmi.File "Hdmi.conf" diff --git a/ucm2/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/sof-hda-dsp/sof-hda-dsp.conf index d7a0518..af966ef 100644 --- a/ucm2/sof-hda-dsp/sof-hda-dsp.conf +++ b/ucm2/sof-hda-dsp/sof-hda-dsp.conf @@ -1,4 +1,4 @@ -Syntax 2 +Syntax 3 SectionUseCase."HiFi" { File "HiFi.conf" |