Skip to content

Bt codec fixes #7035

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

Merged
lgirdwood merged 2 commits into from
Feb 7, 2023
Merged

Bt codec fixes #7035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51051f5
topology2: bluetooth pipeline fixes
Feb 2, 2023
8f261a6
topology2: enable BT offload in cavs-rt5682
Feb 2, 2023
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
15 changes: 5 additions & 10 deletions tools/topology/topology2/cavs-nocodec-bt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Object.Pipeline {

# capture pipelines
passthrough-capture.1 {
index 7
index 5
Object.Widget.pipeline.1 {
stream_name 'NoCodec-0'
}
Expand All @@ -176,7 +176,7 @@ Object.Pipeline {
}

passthrough-be.4 {
index 8
index 6
direction capture
Object.Widget.pipeline.1 {
stream_name 'NoCodec-0'
Expand Down Expand Up @@ -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"
}
Expand Down
2 changes: 2 additions & 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 @@ -34,6 +34,8 @@
<host.conf>
<dmic-default.conf>
<hdmi-default.conf>
<bt-default.conf>
<bt-generic.conf>

Define {
MCLK 24576000
Expand Down
13 changes: 8 additions & 5 deletions tools/topology/topology2/platform/intel/bt-default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Comment thread
kv2019i marked this conversation as resolved.
Outdated
BT_PB_PIPELINE_STREAM_NAME "copier.SSP.8.1"
BT_PB_PCM_CAPS "BT Playback"

BT_CP_HOST_PIPELINE_ID 11
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology2/platform/intel/bt-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,12 @@ Object.Pipeline {
}

Object.Base {
route."5" {
route."500" {
Comment thread
kv2019i marked this conversation as resolved.
Outdated
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
}
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology2/platform/intel/bt-ssp-config-lbm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Object.Dai {
SSP."BT" {
id $BT_INDEX
id $BT_ID
dai_index $BT_INDEX
direction "duplex"
name $BT_NAME
Expand Down
11 changes: 7 additions & 4 deletions tools/topology/topology2/platform/intel/bt-ssp-config.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down
13 changes: 8 additions & 5 deletions tools/topology/topology2/sof-ace-tplg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down