OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology2: cavs: Add support for including DMIC in HDA topology 

Currently we build separate topologies for TGL and CNL since their
io_clk's are different. Eventually, we'd need to unify these and let the
driver handle the blob selection in the kernel.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2022-02-16 10:29:27 -08:00 committed by Liam Girdwood
parent 8d0ac8e2da
commit 0e53d54684
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/topology/topology2/cavs/CMakeLists.txt
View File

@ -6,6 +6,23 @@ set(TPLGS
"cavs-passthrough-hdmi\;cavs-passthrough-hdmi"
# CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda\;HDA_CONFIG=mix"
# If the alsatplg plugins for NHLT are not available, the NHLT blobs will not be added to the
# topologies below.
# TGL: CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-2ch-tgl\;\
HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin"
# CNL: CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-2ch-cnl\;\
HDA_CONFIG=mix,NUM_DMICS=2,PLATFORM=cnl,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin"
# TGL: CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-4ch-tgl\;\
HDA_CONFIG=mix,NUM_DMICS=4,PLATFORM=cnl,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin"
# CNL: CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-4ch-cnl\;\
HDA_CONFIG=mix,NUM_DMICS=4,PLATFORM=cnl,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin"
# CAVS SDW topology with passthrough pipelines
"cavs-sdw\;cavs-sdw"
# CAVS SSP topology with passthrough pipelines, default SSP MCLK is 38.4MHz

15
tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf
View File

@ -19,6 +19,8 @@
<pcm_caps.conf>
<fe_dai.conf>
<hda.conf>
<dmic.conf>
<pdm_config.conf>
<hw_config.conf>
<manifest.conf>
<route.conf>
@ -26,6 +28,14 @@
Define {
HDA_CONFIG "none"
PLATFORM "none"
NUM_DMICS 0
}
# include platform config
IncludeByKey.PLATFORM {
"none" "platform/intel/dmic-default.conf"
"cnl" "platform/intel/cnl.conf"
}
# include HDA config if needed.
@ -34,6 +44,11 @@ IncludeByKey.HDA_CONFIG {
"mix" "cavs-mixin-mixout-hda.conf"
}
# include DMIC config if needed.
IncludeByKey.NUM_DMICS {
"[1-4]" "platform/intel/dmic-generic.conf"
}
Object.Dai {
HDA.4 {
name iDisp1