Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions tools/topology/topology2/cavs-nocodec-bt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ Object.Dai {
sample_bits 32
quirks "lbm_mode"
io_clk $MCLK
Object.Base.hw_config."SSP0" {
Object.Base.hw_config.1 {
name "SSP0"
id 0
mclk_freq $MCLK
bclk_freq 3072000
Expand All @@ -94,7 +95,8 @@ Object.Dai {
quirks "lbm_mode"
io_clk $MCLK

Object.Base.hw_config."SSP1" {
Object.Base.hw_config.1 {
name "SSP1"
id 0
mclk_freq $MCLK
bclk_freq 3072000
Expand Down Expand Up @@ -237,14 +239,18 @@ Object.PCM {
name "Port0"
id 0
direction "duplex"
Object.Base.fe_dai."Port0" {}
Object.Base.fe_dai.1 {
name "Port0"
}

Object.PCM.pcm_caps."playback" {
Object.PCM.pcm_caps.1 {
direction "playback"
name "SSP0 Playback"
formats 'S16_LE,S24_LE,S32_LE'
}

Object.PCM.pcm_caps."capture" {
Object.PCM.pcm_caps.2 {
direction "capture"
name "SSP0 Capture"
formats 'S16_LE,S24_LE,S32_LE'
}
Expand All @@ -253,14 +259,18 @@ Object.PCM {
name "Port1"
id 1
direction "duplex"
Object.Base.fe_dai."Port1" {}
Object.Base.fe_dai.1 {
name "Port1"
}

Object.PCM.pcm_caps."playback" {
Object.PCM.pcm_caps.1 {
direction "playback"
name "SSP1 Playback"
formats 'S16_LE,S24_LE,S32_LE'
}

Object.PCM.pcm_caps."capture" {
Object.PCM.pcm_caps.2 {
direction "capture"
name "SSP1 Capture"
formats 'S16_LE,S24_LE,S32_LE'
}
Expand Down
10 changes: 7 additions & 3 deletions tools/topology/topology2/platform/intel/bt-generic.conf
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,12 @@ Object.PCM {
id $BT_PCM_ID
direction "duplex"

Object.Base.fe_dai."Port2" {}
Object.Base.fe_dai.1 {
name "Port2"
}

Object.PCM.pcm_caps."playback" {
Object.PCM.pcm_caps.1 {
direction "playback"
name $BT_PB_PCM_CAPS
formats 'S16_LE'
rate_min 8000
Expand All @@ -221,7 +224,8 @@ Object.PCM {
channels_max 2
}

Object.PCM.pcm_caps."capture" {
Object.PCM.pcm_caps.2 {
direction "capture"
name $BT_CP_PCM_CAPS
formats 'S16_LE'
rate_min 8000
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: d9c4ec31fc49e7eef3c8c3b0d07827cc04e6efee
revision: ad19019b29a2b1586b6061cc36a7254e645ebc45
remote: zephyrproject
# Import some projects listed in zephyr/west.yml@revision
#
Expand Down