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
1 change: 1 addition & 0 deletions app/boards/intel_adsp_ace15_mtpm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
CONFIG_DAI_DMIC_HW_IOCLK=38400000
CONFIG_DAI_INIT_PRIORITY=70
CONFIG_DMA_DW_LLI_POOL_SIZE=50
CONFIG_DMA_DW_FIFO_PARTITION=y
CONFIG_DMA_INTEL_ADSP_GPDMA=y
CONFIG_MEMORY_WIN_2_SIZE=12288
CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Object.Dai.SSP [
fsync_freq 48000
tdm_slots 2
tx_slots 3
rx_slots 0
rx_slots 3
# link_config ignored for <ACE1.5, must be compatible
# with BT_MCLK
Object.Base.link_config.1 {
Expand Down
9 changes: 9 additions & 0 deletions tools/topology/topology2/production/tplg-targets-ace3.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt722-4ch.bin,DMIC0_ENHANCED_CAPTURE=true,\
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default"

"cavs-sdw\;sof-ptl-rt722-4ch-bt\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=1,NUM_DMICS=4,\
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,HDMI1_ID=7,HDMI2_ID=8,HDMI3_ID=9,\
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,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt722-4ch-bt.bin,DMIC0_ENHANCED_CAPTURE=true,\
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\
BT_PCM_ID=20,BT_ID=10,BT_PCM_NAME=Bluetooth,ADD_BT=true"

# DMIC WoV feature topology; platform-agnostic, shared across PTL/WCL
"dmic-wov-feature\;sof-dmic-4ch-wov\;PLATFORM=none,NUM_DMICS=4,\
DMIC0_ID=5,DMIC1_ID=6,DMIC1_ENABLE=false,DMIC1_RATE=16000,INCLUDE_WOV=true"
Expand Down Expand Up @@ -374,4 +382,5 @@ list(APPEND SYMLINKS
"sof-wcl-dmic-4ch-id3\;sof-ptl-dmic-4ch-id3"
"sof-wcl-dmic-4ch-id4\;sof-ptl-dmic-4ch-id4"
"sof-wcl-dmic-4ch-id5\;sof-ptl-dmic-4ch-id5"
"sof-wcl-rt722-4ch-bt\;sof-ptl-rt722-4ch-bt"
)
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,27 @@ EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default"
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace3-2ch-dax.bin,\
DMIC0_ENHANCED_CAPTURE=true,EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,\
EFX_DMIC0_DRC_PARAMS=dmic_default,DOLBY_DAX_CORE_ID=1"

# Bluetooth SSP2-BT offload topologies for ACE1/ACE2 and ACE3 HDA platforms
"sof-hda-generic\;sof-hda-generic-ace1-bt\;PLATFORM=mtl,HDA_CONFIG=mix,HDA_MIC_ENHANCED_CAPTURE=true,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace1-bt.bin,\
BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
EFX_HDA_MIC_TDFB_PARAMS=line2_pass,EFX_HDA_MIC_DRC_PARAMS=passthrough"

"sof-hda-generic\;sof-hda-generic-ace3-bt\;PLATFORM=ptl,HDA_CONFIG=mix,HDA_MIC_ENHANCED_CAPTURE=true,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace3-bt.bin,\
BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
EFX_HDA_MIC_TDFB_PARAMS=line2_pass,EFX_HDA_MIC_DRC_PARAMS=passthrough"

"sof-hda-generic\;sof-hda-generic-ace3-2ch-bt\;PLATFORM=ptl,HDA_CONFIG=mix,NUM_DMICS=2,\
BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace3-2ch-bt.bin,\
DMIC0_ENHANCED_CAPTURE=true,EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,\
EFX_DMIC0_DRC_PARAMS=dmic_default"

"sof-hda-generic\;sof-hda-generic-ace3-4ch-bt\;PLATFORM=ptl,HDA_CONFIG=mix,NUM_DMICS=4,\
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace3-4ch-bt.bin,DMIC0_ENHANCED_CAPTURE=true,\
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default"
)
9 changes: 8 additions & 1 deletion tools/topology/topology2/sof-hda-generic.conf
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,15 @@
<fe_dai.conf>
<hda.conf>
<dmic.conf>
<ssp.conf>
<pdm_config.conf>
<hw_config_simple.conf>
<intel/hw_config_cardinal_clk.conf>
<manifest.conf>
<route.conf>
<common_definitions.conf>
<dmic-default.conf>
<hdmi-default.conf>
<bt-default.conf>
<deep-buffer-default.conf>
<compr-default.conf>
<module-copier.conf>
Expand All @@ -55,6 +57,7 @@ Define {
HDA_CONFIG "none"
PLATFORM "none"
NUM_DMICS 0
ADD_BT false
# doesn't it need to define DMIC0_HOST_PIPELINE_SINK and DMIC0_DAI_PIPELINE_SRC?
DMIC0_HOST_PIPELINE_SINK 'host-copier.6.capture'
DMIC0_DAI_PIPELINE_SRC 'module-copier.12.2'
Expand All @@ -70,6 +73,10 @@ IncludeByKey.PLATFORM {
"ptl" "platform/intel/ptl.conf"
}

IncludeByKey.ADD_BT {
"true" "platform/intel/bt-generic.conf"
}

# include HDA config if needed.
IncludeByKey.HDA_CONFIG {
"mix" "cavs-mixin-mixout-hda.conf"
Expand Down
Loading