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

topology2: ssp: Add blob version 

Add the SSP blob version and set it based on the platform.

Co-developed-by: Jaska Uimonen <jaska.uimonen@intel.com>
Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-04-03 09:10:35 -07:00 committed by Ranjani Sridharan
parent 525e7e39d1
commit ada8950551
8 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/topology/topology2/avs-tplg/tplg-targets.cmake
View File

@ -40,8 +40,9 @@ DMIC1_ID=3,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,HDMI1_ID=4,HDMI2_ID=5,\
HDMI3_ID=6,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-rt711-4ch.bin" HDMI3_ID=6,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-rt711-4ch.bin"
# BT offload # BT offload
"cavs-nocodec-bt\;sof-nocodec-bt\;PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt.bin" "cavs-nocodec-bt\;sof-nocodec-bt\;PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt.bin,\
PLATFORM=tgl"
# BT offload loopback test topology (lbm) # BT offload loopback test topology (lbm)
"cavs-nocodec-bt\;sof-nocodec-bt-lbm\;BT_LOOPBACK_MODE=true,\ "cavs-nocodec-bt\;sof-nocodec-bt-lbm\;BT_LOOPBACK_MODE=true,PLATFORM=tgl,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-lbm.bin" PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-lbm.bin"
) )

2
tools/topology/topology2/cavs-nocodec-bt.conf
View File

@ -56,6 +56,8 @@ Define {
# override defaults with platform-specific config # override defaults with platform-specific config
IncludeByKey.PLATFORM { IncludeByKey.PLATFORM {
"tgl" "platform/intel/tgl.conf"
"adl" "platform/intel/tgl.conf"
"mtl" "platform/intel/mtl.conf" "mtl" "platform/intel/mtl.conf"
} }

2
tools/topology/topology2/cavs-nocodec.conf
View File

@ -81,6 +81,8 @@ Define {
# override defaults with platform-specific config # override defaults with platform-specific config
IncludeByKey.PLATFORM { IncludeByKey.PLATFORM {
"tgl" "platform/intel/tgl.conf"
"adl" "platform/intel/tgl.conf"
"mtl" "platform/intel/mtl.conf" "mtl" "platform/intel/mtl.conf"
} }

3
tools/topology/topology2/common_definitions.conf
View File

@ -58,4 +58,7 @@ Define {
SPI_INPUT_CLASS 26 # SPI Input (DSP <-) SPI_INPUT_CLASS 26 # SPI Input (DSP <-)
DEEPBUFFER_FW_DMA_MS 100 # 100 ms copier dma size DEEPBUFFER_FW_DMA_MS 100 # 100 ms copier dma size
SSP_BLOB_VERSION_1_0 0x100
SSP_BLOB_VERSION_1_5 0x105
} }

5
tools/topology/topology2/development/tplg-targets.cmake
View File

@ -14,10 +14,11 @@ set(TPLGS
# CAVS SSP topology for TGL # CAVS SSP topology for TGL
"cavs-nocodec\;sof-tgl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ "cavs-nocodec\;sof-tgl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100,\
SSP0_MIXER_2LEVEL=1" SSP0_MIXER_2LEVEL=1,PLATFORM=tgl"
"cavs-nocodec\;sof-adl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ "cavs-nocodec\;sof-adl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100" PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100,\
PLATFORM=adl"
# SDW topology for MTL # SDW topology for MTL
"cavs-sdw\;mtl-sdw\;NUM_HDMIS=0" "cavs-sdw\;mtl-sdw\;NUM_HDMIS=0"

12
tools/topology/topology2/include/dais/ssp.conf
View File

@ -111,6 +111,16 @@ Class.Dai."SSP" {
# platform clock frequency # platform clock frequency
DefineAttribute.io_clk {} DefineAttribute.io_clk {}
# SSP blob version
DefineAttribute.version {
constraints {
!valid_values [
$SSP_BLOB_VERSION_1_0
$SSP_BLOB_VERSION_1_5
]
}
}
attributes { attributes {
!constructor [ !constructor [
"name" "name"
@ -139,4 +149,6 @@ Class.Dai."SSP" {
clks_control 0 clks_control 0
frame_pulse_width 0 frame_pulse_width 0
tdm_padding_per_slot false tdm_padding_per_slot false
# SSP_BLOB_VERSION must be defined in the top-level topology file
version $SSP_BLOB_VERSION
} }

1
tools/topology/topology2/platform/intel/mtl.conf
View File

@ -1,4 +1,5 @@
# MTL-specific variable definitions # MTL-specific variable definitions
Define { Define {
DMIC_DRIVER_VERSION 3 DMIC_DRIVER_VERSION 3
SSP_BLOB_VERSION 0x105
} }

4
tools/topology/topology2/platform/intel/tgl.conf Normal file
View File

@ -0,0 +1,4 @@
# TGL/ADL-specific variable definitions
Define {
SSP_BLOB_VERSION 0x100
}