Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
751 changes: 751 additions & 0 deletions tools/topology/topology2/cavs-nocodec-wov.conf

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions tools/topology/topology2/cavs-rt5682.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<searchdir:include/pipelines/cavs>
<searchdir:platform>
<searchdir:platform/intel>
<searchdir:include/controls>

<vendor-token.conf>
<manifest.conf>
Expand Down Expand Up @@ -53,6 +54,13 @@
<input_audio_format.conf>
<output_audio_format.conf>
<ctc.conf>
<kpb.conf>
<wov-arbiter.conf>
<mww.conf>
<ecns.conf>
<bytes.conf>
<enum.conf>
<mixer.conf>

Define {
MCLK 24576000
Expand Down Expand Up @@ -139,6 +147,11 @@ IncludeByKey.PLATFORM {
"ptl" "platform/intel/ptl.conf"
}

# dmic1-mfcc.conf includes the mfcc class itself, a second include breaks it
IncludeByKey.INCLUDE_WOV {
"multi" "include/components/mfcc.conf"
}

# include DMIC config if needed.
IncludeByKey.NUM_DMICS {
"[1-4]" "platform/intel/dmic-generic.conf"
Expand Down
15 changes: 14 additions & 1 deletion tools/topology/topology2/cavs-sdw.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<searchdir:include/pipelines/cavs>
<searchdir:platform>
<searchdir:platform/intel>
<searchdir:include/controls>

<vendor-token.conf>
<pdm_config.conf>
Expand Down Expand Up @@ -66,6 +67,14 @@
<siggen-host-copier-capture.conf>
<webrtc-aec.conf>
<input_pin_binding.conf>
<output_pin_binding.conf>
<kpb.conf>
<wov-arbiter.conf>
<mww.conf>
<ecns.conf>
<bytes.conf>
<enum.conf>
<mixer.conf>

Define {
PLATFORM "none"
Expand All @@ -82,7 +91,7 @@ Define {
DMIC0_NAME 'dmic01'
DMIC0_ID 4
DMIC1_ID 5
DMIC0_PCM_CAPS 'Gain Capture 13'
DMIC0_PCM_CAPS 'Gain Capture 10'

DEEP_BUFFER_PIPELINE_ID 15
DEEP_BUFFER_PCM_ID 31
Expand Down Expand Up @@ -295,3 +304,7 @@ IncludeByKey.SDW_DMIC_AUDIO_FEATURE_CAPTURE {
IncludeByKey.SDW_DMIC_COMPR_AUDIO_FEATURE_CAPTURE {
"true" "platform/intel/sdw-dmic-audio-feature-compress.conf"
}

IncludeByKey.SDW_DMIC_WOV_SINGLE {
"true" "platform/intel/sdw-dmic-wov-single.conf"
}
34 changes: 34 additions & 0 deletions tools/topology/topology2/development/tplg-targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec.bin,\
SSP1_PCM_CORE_ID=0,SSP2_PCM_CORE_ID=0,\
SSP0_MIXER_2LEVEL=1,PLATFORM=tgl"

# Lean SSP0 NoCodec WoV topology for TGL
"cavs-nocodec-wov\;sof-tgl-nocodec-wov\;PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-sof-tgl-nocodec-wov.bin,PLATFORM=tgl"

# multicore disabled due to SOF issue #8942
"cavs-nocodec\;sof-adl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
SSP1_PCM_CORE_ID=0,SSP2_PCM_CORE_ID=0,\
Expand Down Expand Up @@ -64,6 +68,10 @@ NHLT_BIN=nhlt-sof-lnl-nocodec-fpga-4ch.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000
"cavs-nocodec\;sof-ptl-nocodec\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin,SRC_DOMAIN=DP"

# Lean SSP0 NoCodec WoV topology for PTL
"cavs-nocodec-wov\;sof-ptl-nocodec-wov\;PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-sof-ptl-nocodec-wov.bin,PLATFORM=ptl"

# SSP topology for PTL with 96 kHz DMIC
"cavs-nocodec\;sof-ptl-nocodec-dmic-4ch-96k\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
DMIC0_RATE=96000,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec-dmic-4ch-96k.bin"
Expand Down Expand Up @@ -439,6 +447,26 @@ PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,NUM_HDMIS=4,\
NHLT_BIN=nhlt-sof-adl-max98357a-rt5682.bin,SPK_ID=7,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true,\
INCLUDE_BT_OFFLOAD=false,DEEP_BUF_SPK=true,SPEAKER_CODEC_NAME=SSP2-Codec,SPEAKER_SSP_DAI_INDEX=2"

# Google Brya with raw dmic16k 4ch passthrough capture (no ECNS) for mic diagnostics
"cavs-rt5682\;sof-adl-max98357a-rt5682-dmic16k\;PLATFORM=adl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,DMIC1_ENABLE=passthrough,PREPROCESS_PLUGINS=nhlt,NUM_HDMIS=4,\
NHLT_BIN=nhlt-sof-adl-max98357a-rt5682-dmic16k.bin,SPK_ID=7,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true,\
INCLUDE_BT_OFFLOAD=false,DEEP_BUF_SPK=true,SPEAKER_CODEC_NAME=SSP2-Codec,SPEAKER_SSP_DAI_INDEX=2"

# Google Brya with integrated multi-slot WoV feature on PDM DMICs
"cavs-rt5682\;sof-adl-max98357a-rt5682-wov-multi\;PLATFORM=adl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,NUM_HDMIS=4,DMIC_WOV_DAI_CHANNELS=4,\
NHLT_BIN=nhlt-sof-adl-max98357a-rt5682-wov-multi.bin,SPK_ID=7,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true,\
INCLUDE_BT_OFFLOAD=false,DEEP_BUF_SPK=true,SPEAKER_CODEC_NAME=SSP2-Codec,SPEAKER_SSP_DAI_INDEX=2,\
INCLUDE_WOV=multi"

# Google Brya with multi-slot WoV feature on PDM0 stereo DMIC only
"cavs-rt5682\;sof-adl-max98357a-rt5682-2ch-wov-multi\;PLATFORM=adl,NUM_DMICS=2,\
PREPROCESS_PLUGINS=nhlt,NUM_HDMIS=4,DMIC_WOV_DAI_CHANNELS=2,\
NHLT_BIN=nhlt-sof-adl-max98357a-rt5682-2ch-wov-multi.bin,SPK_ID=7,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true,\
INCLUDE_BT_OFFLOAD=false,DEEP_BUF_SPK=true,SPEAKER_CODEC_NAME=SSP2-Codec,SPEAKER_SSP_DAI_INDEX=2,\
INCLUDE_WOV=multi"

# RT721 eval board with PCH-DMIC, sof_sdw_quirk_table with SOC_SDW_PCH_DMIC
# Enable FLOAT_LE and U8 PCM formats
"cavs-sdw\;sof-ptl-rt721-4ch-allfmt\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=1,NUM_DMICS=4,\
Expand Down Expand Up @@ -584,4 +612,10 @@ COMPRESSED_1=true,COMPRESSED_2=false"
"cavs-sdw\;sof-sdca-amp-compr\;SDW_JACK=false,NUM_HDMIS=0,COMPRESSED=true,\
COMPRESSED_1=false,COMPRESSED_2=true"

# SoundWire WoV topology on PTL (RT713 on L3, RT1320 on L12)
"cavs-sdw\;sof-ptl-rt713-l3-rt1320-l12-wov\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=2,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
SDW_DMIC_WOV_SINGLE=true"

)
Loading
Loading