Skip to content

Commit e4dc655

Browse files
Jaska Uimonenkv2019i
authored andcommitted
topology2: fix bt offload pipeline build
Fix bt offload pipeline with instance ids. This was an unfortunate merge error with recent instance id topology2 commit. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
1 parent 654bde8 commit e4dc655

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

tools/topology/topology2/cavs-nocodec-bt.conf

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ Object.Dai {
7777
sample_bits 32
7878
quirks "lbm_mode"
7979
io_clk $MCLK
80-
Object.Base.hw_config."SSP0" {
80+
Object.Base.hw_config.1 {
81+
name "SSP0"
8182
id 0
8283
mclk_freq $MCLK
8384
bclk_freq 3072000
@@ -94,7 +95,8 @@ Object.Dai {
9495
quirks "lbm_mode"
9596
io_clk $MCLK
9697

97-
Object.Base.hw_config."SSP1" {
98+
Object.Base.hw_config.1 {
99+
name "SSP1"
98100
id 0
99101
mclk_freq $MCLK
100102
bclk_freq 3072000
@@ -237,14 +239,18 @@ Object.PCM {
237239
name "Port0"
238240
id 0
239241
direction "duplex"
240-
Object.Base.fe_dai."Port0" {}
242+
Object.Base.fe_dai.1 {
243+
name "Port0"
244+
}
241245

242-
Object.PCM.pcm_caps."playback" {
246+
Object.PCM.pcm_caps.1 {
247+
direction "playback"
243248
name "SSP0 Playback"
244249
formats 'S16_LE,S24_LE,S32_LE'
245250
}
246251

247-
Object.PCM.pcm_caps."capture" {
252+
Object.PCM.pcm_caps.2 {
253+
direction "capture"
248254
name "SSP0 Capture"
249255
formats 'S16_LE,S24_LE,S32_LE'
250256
}
@@ -253,14 +259,18 @@ Object.PCM {
253259
name "Port1"
254260
id 1
255261
direction "duplex"
256-
Object.Base.fe_dai."Port1" {}
262+
Object.Base.fe_dai.1 {
263+
name "Port1"
264+
}
257265

258-
Object.PCM.pcm_caps."playback" {
266+
Object.PCM.pcm_caps.1 {
267+
direction "playback"
259268
name "SSP1 Playback"
260269
formats 'S16_LE,S24_LE,S32_LE'
261270
}
262271

263-
Object.PCM.pcm_caps."capture" {
272+
Object.PCM.pcm_caps.2 {
273+
direction "capture"
264274
name "SSP1 Capture"
265275
formats 'S16_LE,S24_LE,S32_LE'
266276
}

tools/topology/topology2/platform/intel/bt-generic.conf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,12 @@ Object.PCM {
210210
id $BT_PCM_ID
211211
direction "duplex"
212212

213-
Object.Base.fe_dai."Port2" {}
213+
Object.Base.fe_dai.1 {
214+
name "Port2"
215+
}
214216

215-
Object.PCM.pcm_caps."playback" {
217+
Object.PCM.pcm_caps.1 {
218+
direction "playback"
216219
name $BT_PB_PCM_CAPS
217220
formats 'S16_LE'
218221
rate_min 8000
@@ -221,7 +224,8 @@ Object.PCM {
221224
channels_max 2
222225
}
223226

224-
Object.PCM.pcm_caps."capture" {
227+
Object.PCM.pcm_caps.2 {
228+
direction "capture"
225229
name $BT_CP_PCM_CAPS
226230
formats 'S16_LE'
227231
rate_min 8000

0 commit comments

Comments
 (0)