Skip to content

topology2: sof-hda-generic: support BT offload pipelines #9337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brentlu wants to merge 1 commit into from
Closed

topology2: sof-hda-generic: support BT offload pipelines #9337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions tools/topology/topology2/production/tplg-targets-hda-generic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,15 @@ list(APPEND TPLGS
# passthrough pipelines for HDMI and
# 2 or 4 DMIC, no NHLT blob included in topology
"sof-hda-generic\;sof-hda-generic-2ch\;HDA_CONFIG=mix,NUM_DMICS=2"
"sof-hda-generic\;sof-hda-generic-2ch-bt-ssp2\;HDA_CONFIG=mix,NUM_DMICS=2,\
PLATFORM=mtl,INCLUDE_BT_OFFLOAD=true,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch-bt-ssp2.bin"
"sof-hda-generic\;sof-hda-generic-4ch\;HDA_CONFIG=mix,NUM_DMICS=4,\
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1"
"sof-hda-generic\;sof-hda-generic-4ch-bt-ssp2\;HDA_CONFIG=mix,NUM_DMICS=4,\
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PLATFORM=mtl,INCLUDE_BT_OFFLOAD=true,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-4ch-bt-ssp2.bin"

# HDA topology with mixer-based pipelines for HDA and
# passthrough pipelines for HDMI and
Expand Down
16 changes: 16 additions & 0 deletions tools/topology/topology2/sof-hda-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<pcm.conf>
<pcm_caps.conf>
<fe_dai.conf>
<ssp.conf>
<intel/hw_config_cardinal_clk.conf>
<hda.conf>
<dmic.conf>
<pdm_config.conf>
Expand All @@ -39,6 +41,7 @@
<common_definitions.conf>
<dmic-default.conf>
<hdmi-default.conf>
<bt-default.conf>
<module-copier.conf>

Define {
Expand All @@ -52,6 +55,15 @@ Define {
DMIC0_DAI_GAIN 'eqiir.12.1'
DMIC0_DAI_EQIIR "highpass_40hz_20db"
DMIC0_PCM_CAPS 'Gain Capture 11'
# override BT default definitions
BT_PB_HOST_PIPELINE_ID 9
BT_PB_DAI_PIPELINE_ID 10
BT_PB_DAI_PIPELINE_SRC "copier.host.9.1"
BT_PB_PIPELINE_STREAM_NAME "dai-copier.SSP.10.1"
BT_ID 8
BT_PCM_ID 8
BT_PCM_NAME "Bluetooth"
INCLUDE_BT_OFFLOAD false
}

# override defaults with platform-specific config
Expand All @@ -73,6 +85,10 @@ IncludeByKey.NUM_DMICS {
"[1-4]" "platform/intel/dmic-generic.conf"
}

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

Define {
NUM_HDMIS 3
HDMI1_ID 1
Expand Down