From 24b0783e6abbb2077bc23afea8f3d85446e680ab Mon Sep 17 00:00:00 2001 From: WeirdTreeThing Date: Thu, 28 Mar 2024 00:10:01 -0400 Subject: [PATCH 1/4] adl/sof-nau8825: Add generic support for every speaker amp --- .../{HiFi.osiris.conf => HiFi.conf} | 39 +++--- adl/sof-nau8825/HiFi.kano.conf | 117 ------------------ adl/sof-nau8825/sof-nau8825.conf | 26 ++-- 3 files changed, 26 insertions(+), 156 deletions(-) rename adl/sof-nau8825/{HiFi.osiris.conf => HiFi.conf} (73%) delete mode 100644 adl/sof-nau8825/HiFi.kano.conf diff --git a/adl/sof-nau8825/HiFi.osiris.conf b/adl/sof-nau8825/HiFi.conf similarity index 73% rename from adl/sof-nau8825/HiFi.osiris.conf rename to adl/sof-nau8825/HiFi.conf index 7aea1d2..b246093 100644 --- a/adl/sof-nau8825/HiFi.osiris.conf +++ b/adl/sof-nau8825/HiFi.conf @@ -1,10 +1,3 @@ -SectionVerb { - EnableSequence [ - cset "name='Mic Volume' 230" - cset "name='Frontend PGA Volume' 24" - ] -} - # Split 4ch dmic into 2 virtual 2ch mics Include.pcm_split.File "/common/pcm/split.conf" @@ -24,19 +17,21 @@ Macro [ } ] -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},0" +If.max98360a { + Condition { + Type String + Empty "$${var:max98360a}" } - EnableSequence [ - cset "name='Spk Switch' on" - ] - DisableSequence [ - cset "name='Spk Switch' off" - ] + False.Include.speaker.File "/codecs/max98357a/speaker.conf" +} + + +If.max98373 { + Condition { + Type String + Empty "$${var:max98373}" + } + False.Include.speaker.File "/codecs/max98373/speaker.conf" } SectionDevice."Headphones" { @@ -60,13 +55,13 @@ SectionDevice."Mic" { Value { CapturePriority 100 - CapturePCM "hw:${CardId},99" + CapturePCM "hw:${CardId},${var:dmicpcm}" CaptureChannels 4 } Macro.pcm_split.SplitPCMDevice { Name "adl_stereo_in" Direction Capture - Device 99 + Device ${var:dmicpcm} HWChannels 4 Channels 2 Channel0 0 @@ -93,4 +88,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/codecs/hda/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/${var:hdmi}.conf" diff --git a/adl/sof-nau8825/HiFi.kano.conf b/adl/sof-nau8825/HiFi.kano.conf deleted file mode 100644 index ea827e1..0000000 --- a/adl/sof-nau8825/HiFi.kano.conf +++ /dev/null @@ -1,117 +0,0 @@ -SectionVerb { - EnableSequence [ - cset "name='Frontend PGA Volume' 12" - cset "name='Mic Volume' 255" - cset "name='Left DAI Sel Mux' Right" - cset "name='Right DAI Sel Mux' Left" - cset "name='Left Digital Volume' 127" - cset "name='Right Digital Volume' 127" - cset "name='Left FS Max Volume' 6" - cset "name='Right FS Max Volume' 6" - ] -} - -# Split 4ch dmic into 2 virtual 2ch mics -Include.pcm_split.File "/common/pcm/split.conf" - -Macro [ - { - SplitPCM { - Name "adl_stereo_in" - Direction Capture - Format S32_LE - Channels 2 - HWChannels 4 - HWChannelPos0 FL - HWChannelPos1 FR - HWChannelPos2 FL - HWChannelPos3 FR - } - } -] - -SectionDevice."Speaker" { - Comment "Internal Speakers" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},0" - EchoReferenceDev "Echo Reference" - } - EnableSequence [ - cset "name='Spk Switch' on" - cset "name='Left Spk Switch' on" - cset "name='Right Spk Switch' on" - cset "name='Left VI Sense Switch' on" - cset "name='Right VI Sense Switch' on" - ] - DisableSequence [ - cset "name='Spk Switch' off" - cset "name='Left Spk Switch' off" - cset "name='Right Spk Switch' off" - cset "name='Left VI Sense Switch' off" - cset "name='Right VI Sense Switch' off" - ] -} - -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId},1" - JackControl "Headphone Jack" - } - EnableSequence [ - cset "name='Headphone Jack Switch' on" - ] - DisableSequence [ - cset "name='Headphone Jack Switch' off" - ] -} - -SectionDevice."Echo Reference" { - Value { - CapturePCM "hw:${CardId},0" - } -} - -SectionDevice."Mic" { - Comment "Internal Microphone" - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},99" - CaptureChannels 4 - } - Macro.pcm_split.SplitPCMDevice { - Name "adl_stereo_in" - Direction Capture - Device 99 - HWChannels 4 - Channels 2 - Channel0 0 - Channel1 1 - ChannelPos0 FL - ChannelPos1 FR - } -} - -SectionDevice."Headset" { - Comment "Headset Microphone" - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId},1" - CaptureMixerElem "Headset Mic" - JackControl "Headset Mic Jack" - } - EnableSequence [ - cset "name='Headset Mic Switch' on" - ] - DisableSequence [ - cset "name='Headset Mic Switch' off" - ] -} - -Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-nau8825/sof-nau8825.conf b/adl/sof-nau8825/sof-nau8825.conf index 941d80a..47387ec 100644 --- a/adl/sof-nau8825/sof-nau8825.conf +++ b/adl/sof-nau8825/sof-nau8825.conf @@ -1,25 +1,17 @@ Syntax 6 -If.osiris { - Condition { - Type String - Haystack "${sys:devices/virtual/dmi/id/product_name}" - Needle "Osiris" - } - True.SectionUseCase."HiFi" { - File "HiFi.osiris.conf" - Comment "Default" - } +SectionUseCase."HiFi" { + File "HiFi.conf" + Comment "Default" } -If.kano { +Include.platform.File "/platforms/intel-sof/platform.conf" +Include.codec-init.File "/codecs/nau8825/init.conf" + +If.max98373 { Condition { Type String - Haystack "${sys:devices/virtual/dmi/id/product_name}" - Needle "Kano" - } - True.SectionUseCase."HiFi" { - File "HiFi.kano.conf" - Comment "Default" + Empty "$${var:max98373}" } + False.Include.max98373-init.File "/codecs/max98373/init.conf" } From 09bcb40df56f6c7801608ab196eab2e9a8d3b499 Mon Sep 17 00:00:00 2001 From: WeirdTreeThing Date: Fri, 29 Mar 2024 21:12:01 -0400 Subject: [PATCH 2/4] codecs: add nau8825 --- codecs/nau8825/init.conf | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 codecs/nau8825/init.conf diff --git a/codecs/nau8825/init.conf b/codecs/nau8825/init.conf new file mode 100644 index 0000000..72aaea7 --- /dev/null +++ b/codecs/nau8825/init.conf @@ -0,0 +1,7 @@ +# NAU8825 specific volume control settings + +BootSequence [ + cset "name='Mic Volume' 230" + cset "name='Frontend PGA Volume' 24" +] + From d9e279100fb8f090060f1654b74ecf8870b2b6f7 Mon Sep 17 00:00:00 2001 From: WeirdTreeThing Date: Fri, 29 Mar 2024 21:38:55 -0400 Subject: [PATCH 3/4] adl/sof-nau8825: fix syntax error --- adl/sof-nau8825/HiFi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adl/sof-nau8825/HiFi.conf b/adl/sof-nau8825/HiFi.conf index b246093..1dc4ba4 100644 --- a/adl/sof-nau8825/HiFi.conf +++ b/adl/sof-nau8825/HiFi.conf @@ -61,7 +61,7 @@ SectionDevice."Mic" { Macro.pcm_split.SplitPCMDevice { Name "adl_stereo_in" Direction Capture - Device ${var:dmicpcm} + Device "${var:dmicpcm}" HWChannels 4 Channels 2 Channel0 0 From 9e19d7cf04c8b9a78ae58a9dd8e8ff6357742b2c Mon Sep 17 00:00:00 2001 From: WeirdTreeThing Date: Fri, 29 Mar 2024 22:18:29 -0400 Subject: [PATCH 4/4] codecs: move to common intel-sof platform dir --- adl/sof-nau8825/sof-nau8825.conf | 1 + {sof-rt5682 => platforms/intel-sof}/codecs.conf | 0 sof-rt5682/sof-rt5682.conf | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename {sof-rt5682 => platforms/intel-sof}/codecs.conf (100%) diff --git a/adl/sof-nau8825/sof-nau8825.conf b/adl/sof-nau8825/sof-nau8825.conf index 47387ec..25ab266 100644 --- a/adl/sof-nau8825/sof-nau8825.conf +++ b/adl/sof-nau8825/sof-nau8825.conf @@ -6,6 +6,7 @@ SectionUseCase."HiFi" { } Include.platform.File "/platforms/intel-sof/platform.conf" +Include.codec.File "/platforms/intel-sof/codecs.conf" Include.codec-init.File "/codecs/nau8825/init.conf" If.max98373 { diff --git a/sof-rt5682/codecs.conf b/platforms/intel-sof/codecs.conf similarity index 100% rename from sof-rt5682/codecs.conf rename to platforms/intel-sof/codecs.conf diff --git a/sof-rt5682/sof-rt5682.conf b/sof-rt5682/sof-rt5682.conf index 7828a7a..dd8ec7e 100644 --- a/sof-rt5682/sof-rt5682.conf +++ b/sof-rt5682/sof-rt5682.conf @@ -6,7 +6,7 @@ SectionUseCase."HiFi" { } Include.platform.File "/platforms/intel-sof/platform.conf" -Include.codec.File "codecs.conf" +Include.codec.File "/platforms/intel-sof/codecs.conf" # headphone codecs