Skip to content
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

Tools: Topology2: Add topologies builds for PTL #9317

Merged
merged 3 commits into from
Sep 17, 2024
Merged

Tools: Topology2: Add topologies builds for PTL #9317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c02c80
Tools: Topology2: Build nocodec topologies for PTL and PTL FPGA
singalsu Feb 28, 2024
65f77ab
Tools: Topology2: Add topology sof-ptl-max98357a-rt5682-ssp2-ssp0
singalsu Jul 16, 2024
dae98ff
Tools: Topology2: Add build of 96 kHz DMIC nocodec topologies for PTL
singalsu Jul 25, 2024
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
47 changes: 47 additions & 0 deletions tools/topology/topology2/cavs-nocodec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ IncludeByKey.PLATFORM {
"adl" "platform/intel/tgl.conf"
"mtl" "platform/intel/mtl.conf"
"lnl" "platform/intel/lnl.conf"
"ptl" "platform/intel/ptl.conf"
}

# include DMIC config if needed.
Expand Down Expand Up @@ -328,10 +329,12 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 2
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_rate $DMIC0_RATE
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
Expand All @@ -343,10 +346,12 @@ IncludeByKey.PASSTHROUGH {
num_output_audio_formats 2
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_rate $DMIC0_RATE
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
Expand All @@ -360,10 +365,12 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 2
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_rate $DMIC0_RATE
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
Expand All @@ -375,10 +382,12 @@ IncludeByKey.PASSTHROUGH {
num_output_audio_formats 2
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_rate $DMIC0_RATE
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
Expand Down Expand Up @@ -764,10 +773,12 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 2
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_rate $DMIC0_RATE
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
Expand All @@ -779,10 +790,12 @@ IncludeByKey.PASSTHROUGH {
num_output_audio_formats 2
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_rate $DMIC0_RATE
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
Expand All @@ -796,10 +809,12 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 2
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_rate $DMIC0_RATE
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
Expand All @@ -811,10 +826,12 @@ IncludeByKey.PASSTHROUGH {
num_output_audio_formats 2
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_rate $DMIC0_RATE
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
Expand All @@ -840,10 +857,12 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 2
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_rate $DMIC0_RATE
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
Expand All @@ -855,10 +874,12 @@ IncludeByKey.PASSTHROUGH {
num_output_audio_formats 2
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_rate $DMIC0_RATE
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
Expand All @@ -872,10 +893,12 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 2
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_rate $DMIC0_RATE
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
Expand All @@ -887,10 +910,12 @@ IncludeByKey.PASSTHROUGH {
num_output_audio_formats 2
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_rate $DMIC0_RATE
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
Expand Down Expand Up @@ -960,6 +985,17 @@ IncludeByKey.PASSTHROUGH {
formats 'S32_LE'
channels_min $NUM_DMICS
channels_max $NUM_DMICS
IncludeByKey.DMIC0_RATE {
"16000" {
rates '16000'
}
"48000" {
rates '48000'
}
"96000" {
rates '96000'
}
}
}
}
{
Expand All @@ -974,6 +1010,17 @@ IncludeByKey.PASSTHROUGH {
formats 'S32_LE'
channels_min $NUM_DMICS
channels_max $NUM_DMICS
IncludeByKey.DMIC0_RATE {
"16000" {
rates '16000'
}
"48000" {
rates '48000'
}
"96000" {
rates '96000'
}
}
}
}
{
Expand Down
1 change: 1 addition & 0 deletions tools/topology/topology2/cavs-rt5682.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ Define {
IncludeByKey.PLATFORM {
"mtl" "platform/intel/mtl.conf"
"lnl" "platform/intel/lnl.conf"
"ptl" "platform/intel/ptl.conf"
}

# include DMIC config if needed.
Expand Down
29 changes: 29 additions & 0 deletions tools/topology/topology2/development/tplg-targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,35 @@ NHLT_BIN=nhlt-sof-lnl-nocodec-fpga-4ch.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000
# HDA topology with passthrough analog codec pipelines using CHAIN_DMA
"sof-hda-generic\;sof-hda-passthrough-chain-dma\;HDA_CONFIG=passthrough\;CODEC_HDA_CHAIN_DMA=true"

# SSP topology for PTL
"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"

# 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"

# SSP topology for PTL FPGA with lower DMIC IO clock of 19.2MHz, 2ch PDM0 enabled
"cavs-nocodec\;sof-ptl-nocodec-fpga-2ch-pdm0\;PLATFORM=ptl,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-sof-ptl-nocodec-fpga-2ch-pdm0.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000"

# SSP topology for PTL FPGA with lower DMIC IO clock of 19.2MHz, 4ch both PDM0 and PDM1 enabled
"cavs-nocodec\;sof-ptl-nocodec-fpga-4ch\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-sof-ptl-nocodec-fpga-4ch.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000"

# SSP topology for PTL FPGA with lower DMIC IO clock of 19.2MHz, 4ch both PDM0 and PDM1 enabled, with 96 kHz DMIC
"cavs-nocodec\;sof-ptl-nocodec-fpga-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-fpga-dmic-4ch-96k.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000"

# Topology for PTL with max98357a and rt5682
"cavs-rt5682\;sof-ptl-max98357a-rt5682-ssp2-ssp0\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-sof-ptl-max98357a-rt5682-ssp2-ssp0.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\
SPK_ID=6,SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,DEEP_BUF_SPK=true"

# CAVS HDA topology with mixer-based efx eq pipelines for HDA and passthrough pipelines for HDMI
"sof-hda-generic\;sof-hda-efx-generic\;HDA_CONFIG=efx,HDA_MIC_ENHANCED_CAPTURE=true,\
EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,EFX_DRC_PARAMS=passthrough,\
Expand Down
1 change: 1 addition & 0 deletions tools/topology/topology2/include/common/common_definitions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@ Define {

SSP_BLOB_VERSION_1_0 0x100
SSP_BLOB_VERSION_1_5 0x105
SSP_BLOB_VERSION_3_0 0x300
}
1 change: 1 addition & 0 deletions tools/topology/topology2/include/dais/ssp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ Class.Dai."SSP" {
!valid_values [
$SSP_BLOB_VERSION_1_0
$SSP_BLOB_VERSION_1_5
$SSP_BLOB_VERSION_3_0
]
}
}
Expand Down
13 changes: 11 additions & 2 deletions tools/topology/topology2/platform/intel/dmic-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,8 +721,17 @@ Object.PCM.pcm [
formats 'S32_LE'
channels_min $DMIC0_PCM_CHANNELS
channels_max $DMIC0_PCM_CHANNELS
rate_min $DMIC0_RATE
rate_max $DMIC0_RATE
IncludeByKey.DMIC0_RATE {
"16000" {
rates '16000'
}
"48000" {
rates '48000'
}
"96000" {
rates '96000'
}
}
}
}
]
Expand Down