From 3de4a6e5d7b6420813a5e830eafa588f78c709fa Mon Sep 17 00:00:00 2001 From: Uday M Bhat Date: Wed, 21 Jun 2023 21:48:36 +0530 Subject: [PATCH] topology2: cavs-sdw : Update BT offload SSP for MTL chromebook For MTL chromebook, SSP 1 is used for BT offload with cavs-sdw configuration Co-developed-by: Yong Zhi Signed-off-by: Yong Zhi Co-developed-by: Jairaj Arava Signed-off-by: Jairaj Arava Signed-off-by: Ranjani Sridharan Signed-off-by: Uday M Bhat --- tools/topology/topology2/cavs-sdw.conf | 10 +++++++++- .../topology/topology2/sof-ace-tplg/tplg-targets.cmake | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index 2dd47fa00..a33e60e92 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -28,7 +28,7 @@ - + @@ -42,6 +42,9 @@ + + + Define { PLATFORM "none" @@ -75,6 +78,7 @@ Define { SDW_JACK true PASSTHROUGH false SDW_JACK_CAPTURE_CH 2 + ADD_BT false } # override defaults with platform-specific config @@ -83,6 +87,10 @@ IncludeByKey.PLATFORM { "lnl" "platform/intel/mtl.conf" } +IncludeByKey.ADD_BT { + "true" "platform/intel/bt-generic.conf" +} + # include DMIC config if needed. IncludeByKey.NUM_DMICS { "[1-4]" "platform/intel/dmic-generic.conf" diff --git a/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake b/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake index ddc7d13a1..7ada6650f 100644 --- a/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake +++ b/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake @@ -57,6 +57,7 @@ DEEPBUFFER_FW_DMA_MS=10,DEEPBUFFER_D0I3_COMPATIBLE=true" "cavs-sdw\;sof-mtl-sdw-cs42l42-l0-max98363-l2\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\ PDM1_MIC_B_ENABLE=1,DMIC0_ID=3,DMIC1_ID=4,USE_CHAIN_DMA=true,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-sdw-cs42l42-l0-max98363-l2.bin,\ +BT_NAME=SSP1-BT,BT_INDEX=1,BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=true,\ NUM_SDW_AMP_LINKS=1,SDW_SPK_STREAM=SDW2-Playback,SDW_AMP_FEEDBACK=false,\ SDW_JACK_CAPTURE_CH=1,DEEPBUFFER_FW_DMA_MS=100,DEEPBUFFER_D0I3_COMPATIBLE=true" )