diff --git a/tools/topology/topology2/cavs-nocodec-bt.conf b/tools/topology/topology2/cavs-nocodec-bt.conf index 5251027afe6f..2cce74f013f2 100644 --- a/tools/topology/topology2/cavs-nocodec-bt.conf +++ b/tools/topology/topology2/cavs-nocodec-bt.conf @@ -166,7 +166,7 @@ Object.Pipeline { # capture pipelines passthrough-capture.1 { - index 7 + index 5 Object.Widget.pipeline.1 { stream_name 'NoCodec-0' } @@ -176,7 +176,7 @@ Object.Pipeline { } passthrough-be.4 { - index 8 + index 6 direction capture Object.Widget.pipeline.1 { stream_name 'NoCodec-0' @@ -289,21 +289,16 @@ Object.Base { } route."3" { - source "copier.host.5.1" - sink "copier.SSP.6.1" + source "copier.SSP.6.1" + sink "copier.host.5.1" } route."4" { - source "copier.SSP.8.1" - sink "copier.host.7.1" - } - - route."5" { source "copier.SSP.10.1" sink "copier.host.9.1" } - route."6" { + route."5" { source "copier.SSP.12.1" sink "copier.host.11.1" } diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf index 63787b19eb07..33f28ab9c002 100644 --- a/tools/topology/topology2/cavs-rt5682.conf +++ b/tools/topology/topology2/cavs-rt5682.conf @@ -34,6 +34,8 @@ + + Define { MCLK 24576000 diff --git a/tools/topology/topology2/platform/intel/bt-default.conf b/tools/topology/topology2/platform/intel/bt-default.conf index 596603e547c1..8cd157c25938 100644 --- a/tools/topology/topology2/platform/intel/bt-default.conf +++ b/tools/topology/topology2/platform/intel/bt-default.conf @@ -1,15 +1,18 @@ # Default BT variable definitions Define { + # BT_ID is dai link ID that is matched with machine driver + BT_ID 2 + # BT_INDEX is dai_index which passed to firmware BT_INDEX 2 FORMAT s16le BT_MCLK 38400000 BT_NAME "SSP2-BT" - BT_PB_HOST_PIPELINE_ID 5 - BT_PB_DAI_PIPELINE_ID 6 - BT_PB_HOST_PIPELINE_SINK "copier.host.5.1" - BT_PB_DAI_PIPELINE_SRC "copier.SSP.6.1" - BT_PB_PIPELINE_STREAM_NAME "copier.SSP.6.1" + BT_PB_HOST_PIPELINE_ID 7 + BT_PB_DAI_PIPELINE_ID 8 + BT_PB_HOST_PIPELINE_SINK "copier.SSP.8.1" + BT_PB_DAI_PIPELINE_SRC "copier.host.7.1" + BT_PB_PIPELINE_STREAM_NAME "copier.SSP.8.1" BT_PB_PCM_CAPS "BT Playback" BT_CP_HOST_PIPELINE_ID 11 diff --git a/tools/topology/topology2/platform/intel/bt-generic.conf b/tools/topology/topology2/platform/intel/bt-generic.conf index 4b762a190226..5c67a4e549d3 100644 --- a/tools/topology/topology2/platform/intel/bt-generic.conf +++ b/tools/topology/topology2/platform/intel/bt-generic.conf @@ -200,12 +200,12 @@ Object.Pipeline { } Object.Base { - route."5" { + route."500" { source $BT_PB_DAI_PIPELINE_SRC sink $BT_PB_HOST_PIPELINE_SINK } - route."6" { + route."501" { source $BT_CP_DAI_PIPELINE_SRC sink $BT_CP_HOST_PIPELINE_SINK } diff --git a/tools/topology/topology2/platform/intel/bt-ssp-config-lbm.conf b/tools/topology/topology2/platform/intel/bt-ssp-config-lbm.conf index 9d959b6b43f0..2f33acb4d275 100644 --- a/tools/topology/topology2/platform/intel/bt-ssp-config-lbm.conf +++ b/tools/topology/topology2/platform/intel/bt-ssp-config-lbm.conf @@ -1,6 +1,6 @@ Object.Dai { SSP."BT" { - id $BT_INDEX + id $BT_ID dai_index $BT_INDEX direction "duplex" name $BT_NAME diff --git a/tools/topology/topology2/platform/intel/bt-ssp-config.conf b/tools/topology/topology2/platform/intel/bt-ssp-config.conf index 05e04ae96930..477f04583e2d 100644 --- a/tools/topology/topology2/platform/intel/bt-ssp-config.conf +++ b/tools/topology/topology2/platform/intel/bt-ssp-config.conf @@ -1,14 +1,15 @@ Object.Dai { SSP."BT" { - id $BT_INDEX + id $BT_ID dai_index $BT_INDEX direction "duplex" name $BT_NAME default_hw_conf_id 0 sample_bits 16 io_clk $BT_MCLK - Object.Base.hw_config."SSP2_0" { + Object.Base.hw_config.1 { id 0 + name "BT-SCO-WB" mclk_freq $BT_MCLK bclk_freq 256000 bclk_invert true @@ -21,8 +22,9 @@ Object.Dai { tx_slots 1 rx_slots 1 } - Object.Base.hw_config."SSP2_1" { + Object.Base.hw_config.2 { id 1 + name "BT-SCO-NB" mclk_freq $BT_MCLK bclk_freq 128000 bclk_invert true @@ -35,9 +37,10 @@ Object.Dai { tx_slots 1 rx_slots 1 } - Object.Base.hw_config."SSP2_2" { + Object.Base.hw_config.3 { id 2 mclk_freq $BT_MCLK + name "BT-A2DP" bclk_freq 1536000 tdm_slot_width 16 format "DSP_A" diff --git a/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt b/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt index 034fc80b44fd..c2dbb2a6d7cf 100644 --- a/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt +++ b/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt @@ -20,13 +20,16 @@ DEEPBUFFER_FW_DMA_MS=100" "cavs-sdw\;sof-mtl-rt711-4ch\;PLATFORM=mtl,NUM_DMICS=4,DMIC0_ID=2,DMIC1_ID=3,NUM_HDMIS=0,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-rt711-4ch.bin,DEEPBUFFER_FW_DMA_MS=100" -"cavs-rt5682\;sof-mtl-max98357a-rt5682\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ -DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true" +"cavs-rt5682\;sof-mtl-max98357a-rt5682\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\ +PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\ +NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true,\ +BT_NAME=SSP2-BT,BT_ID=8,BT_PCM_NAME=Bluetooth" "cavs-rt5682\;sof-mtl-max98357a-rt5682-ssp2-ssp0\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\ -PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,\ -DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,\ -SPEAKER_CODEC_NAME=SSP0-Codec" +PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\ +NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\ +SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,BT_INDEX=1,\ +BT_PCM_ID=1,BT_NAME=SSP1-BT,BT_ID=1,BT_PCM_NAME=Bluetooth" ) add_custom_target(topology2_ace)