Skip to content

Commit 984a2b0

Browse files
lrgirdwolrgirdwo
committed
topology2: wov: set capture_compatible_d0i3 to true on WoV PCMs
Align capture_compatible_d0i3 to canonical boolean 'true' across all Wake-on-Voice PCM endpoints (DMIC Multi-WOV, DMIC ECNS Capture, and BT WOV) and host copiers in topology2 templates and manifests, matching upstream pcm.conf 'stream.bool' token conventions.
1 parent a65189f commit 984a2b0

11 files changed

Lines changed: 23 additions & 23 deletions

‎src/audio/wov_arbiter/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ graph TD
234234
| Slot 2 core affinity | DSP Core 1 (cross-core scheduling validation) |
235235
| Host capture device | card 0, device 11 — `hw:0,11` / `pcmC0D11c` (ALSA PCM) |
236236
| Audio Delivery | Standard ALSA PCM capture stream (16 kHz, 2-channel, 16-bit / 32-bit) |
237-
| D0i3 / S0iX | Supported — `capture_compatible_d0i3 1` on host-copier and PCM widget |
237+
| D0i3 / S0iX | Supported — `capture_compatible_d0i3 true` on host-copier and PCM widget |
238238

239239
---
240240

@@ -629,10 +629,10 @@ The WOV capture stream supports D0i3 runtime PM autosuspend and wake-up transiti
629629
```text
630630
# dmic-wov-multi-manifest.conf
631631
Object.Widget.host-copier."...":
632-
capture_compatible_d0i3 1 # host-copier allows D0i3
632+
capture_compatible_d0i3 true # host-copier allows D0i3
633633
634634
Object.PCM.pcm."$DMIC_PCM_ID":
635-
capture_compatible_d0i3 1 # PCM object allows D0i3
635+
capture_compatible_d0i3 true # PCM object allows D0i3
636636
```
637637

638638
### IPC4 Module Control via `sof-ctl`

‎tools/topology/topology2/dmic-wov-multi-4ch-manifest.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ Object.PCM.pcm."$ECNS_PCM_ID" {
11191119
name "DMIC ECNS Capture"
11201120
id $ECNS_PCM_ID
11211121
direction "capture"
1122-
capture_compatible_d0i3 1
1122+
capture_compatible_d0i3 true
11231123

11241124
Object.Base.fe_dai."$ECNS_PCM_CAPS" {}
11251125

@@ -1139,7 +1139,7 @@ Object.PCM.pcm."$DMIC_PCM_ID" {
11391139
name "DMIC Multi-WOV"
11401140
id $DMIC_PCM_ID
11411141
direction "capture"
1142-
capture_compatible_d0i3 1
1142+
capture_compatible_d0i3 true
11431143

11441144
Object.Base.fe_dai."$DMIC_PCM_CAPS" {}
11451145

‎tools/topology/topology2/dmic-wov-multi-manifest.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ Object.PCM.pcm."$DMIC_PCM_ID" {
631631
name "DMIC Multi-WOV"
632632
id $DMIC_PCM_ID
633633
direction "capture"
634-
capture_compatible_d0i3 1
634+
capture_compatible_d0i3 true
635635

636636
Object.Base.fe_dai."$DMIC_PCM_CAPS" {}
637637

‎tools/topology/topology2/dmic-wov-multi-ptl-4ch-manifest.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ Object.Pipeline."custom-capture" [
10521052
# IPC4 reads SOF_TKN_STREAM_CAPTURE_COMPATIBLE_D0I3 from the
10531053
# host-copier widget tuples, not from the PCM object, so the
10541054
# WoV stream must carry it here to stay up across S0iX in D0i3.
1055-
capture_compatible_d0i3 1
1055+
capture_compatible_d0i3 true
10561056

10571057
num_input_audio_formats 1
10581058
Object.Base.input_audio_format [
@@ -1204,7 +1204,7 @@ Object.PCM.pcm."$ECNS_PCM_ID" {
12041204
name "DMIC ECNS Capture"
12051205
id $ECNS_PCM_ID
12061206
direction "capture"
1207-
capture_compatible_d0i3 1
1207+
capture_compatible_d0i3 true
12081208

12091209
Object.Base.fe_dai."$ECNS_PCM_CAPS" {}
12101210

@@ -1224,7 +1224,7 @@ Object.PCM.pcm."$DMIC_PCM_ID" {
12241224
name "DMIC Multi-WOV"
12251225
id $DMIC_PCM_ID
12261226
direction "capture"
1227-
capture_compatible_d0i3 1
1227+
capture_compatible_d0i3 true
12281228

12291229
Object.Base.fe_dai."$DMIC_PCM_CAPS" {}
12301230

‎tools/topology/topology2/dmic-wov-multi-ptl-manifest.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ Object.PCM.pcm."$DMIC_PCM_ID" {
639639
name "DMIC Multi-WOV"
640640
id $DMIC_PCM_ID
641641
direction "capture"
642-
capture_compatible_d0i3 1
642+
capture_compatible_d0i3 true
643643

644644
Object.Base.fe_dai."$DMIC_PCM_CAPS" {}
645645

‎tools/topology/topology2/dmic-wov-multi-wcl-4ch-manifest.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ Object.Pipeline."custom-capture" [
10521052
# IPC4 reads SOF_TKN_STREAM_CAPTURE_COMPATIBLE_D0I3 from the
10531053
# host-copier widget tuples, not from the PCM object, so the
10541054
# WoV stream must carry it here to stay up across S0iX in D0i3.
1055-
capture_compatible_d0i3 1
1055+
capture_compatible_d0i3 true
10561056

10571057
num_input_audio_formats 1
10581058
Object.Base.input_audio_format [
@@ -1204,7 +1204,7 @@ Object.PCM.pcm."$ECNS_PCM_ID" {
12041204
name "DMIC ECNS Capture"
12051205
id $ECNS_PCM_ID
12061206
direction "capture"
1207-
capture_compatible_d0i3 1
1207+
capture_compatible_d0i3 true
12081208

12091209
Object.Base.fe_dai."$ECNS_PCM_CAPS" {}
12101210

@@ -1224,7 +1224,7 @@ Object.PCM.pcm."$DMIC_PCM_ID" {
12241224
name "DMIC Multi-WOV"
12251225
id $DMIC_PCM_ID
12261226
direction "capture"
1227-
capture_compatible_d0i3 1
1227+
capture_compatible_d0i3 true
12281228

12291229
Object.Base.fe_dai."$DMIC_PCM_CAPS" {}
12301230

‎tools/topology/topology2/dmic-wov-multi-wcl-manifest.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ Object.PCM.pcm."$DMIC_PCM_ID" {
639639
name "DMIC Multi-WOV"
640640
id $DMIC_PCM_ID
641641
direction "capture"
642-
capture_compatible_d0i3 1
642+
capture_compatible_d0i3 true
643643

644644
Object.Base.fe_dai."$DMIC_PCM_CAPS" {}
645645

‎tools/topology/topology2/platform/intel/dmic-wov-multi.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ Object.Pipeline."custom-capture" [
11211121

11221122
# IPC4 reads SOF_TKN_STREAM_CAPTURE_COMPATIBLE_D0I3 from the
11231123
# host-copier widget tuples for low-power D0i3 WoV capture across S0iX
1124-
capture_compatible_d0i3 1
1124+
capture_compatible_d0i3 true
11251125

11261126
num_input_audio_formats 1
11271127
Object.Base.input_audio_format [
@@ -1239,7 +1239,7 @@ Object.PCM.pcm [
12391239
name "DMIC ECNS Capture"
12401240
id $DMIC_ECNS_PCM_ID
12411241
direction "capture"
1242-
capture_compatible_d0i3 1
1242+
capture_compatible_d0i3 true
12431243

12441244
Object.Base.fe_dai.1 {
12451245
name "$DMIC_ECNS_PCM_CAPS"
@@ -1257,7 +1257,7 @@ Object.PCM.pcm [
12571257
name "DMIC Multi-WOV"
12581258
id $DMIC_WOV_PCM_ID
12591259
direction "capture"
1260-
capture_compatible_d0i3 1
1260+
capture_compatible_d0i3 true
12611261

12621262
Object.Base.fe_dai.1 {
12631263
name "$DMIC_WOV_PCM_CAPS"

‎tools/topology/topology2/ssp0-wov-multi-manifest.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ Object.Pipeline.host-gateway-capture [
447447
Object.Widget.host-copier.1 {
448448
stream_name $DMIC_PCM_CAPS
449449
pcm_id $DMIC_PCM_ID
450-
capture_compatible_d0i3 1
450+
capture_compatible_d0i3 true
451451
num_input_audio_formats 1
452452
Object.Base.input_audio_format [
453453
{
@@ -709,7 +709,7 @@ Object.PCM.pcm."$DMIC_PCM_ID" {
709709
name "DMIC Multi-WOV"
710710
id $DMIC_PCM_ID
711711
direction "capture"
712-
capture_compatible_d0i3 1
712+
capture_compatible_d0i3 true
713713

714714
Object.Base.fe_dai."$DMIC_PCM_CAPS" {}
715715

‎tools/topology/topology2/ssp1-wov-multi-manifest.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ Object.Pipeline.host-gateway-capture [
447447
Object.Widget.host-copier.1 {
448448
stream_name $DMIC_PCM_CAPS
449449
pcm_id $DMIC_PCM_ID
450-
capture_compatible_d0i3 1
450+
capture_compatible_d0i3 true
451451
num_input_audio_formats 1
452452
Object.Base.input_audio_format [
453453
{
@@ -709,7 +709,7 @@ Object.PCM.pcm."$DMIC_PCM_ID" {
709709
name "DMIC Multi-WOV"
710710
id $DMIC_PCM_ID
711711
direction "capture"
712-
capture_compatible_d0i3 1
712+
capture_compatible_d0i3 true
713713

714714
Object.Base.fe_dai."$DMIC_PCM_CAPS" {}
715715

0 commit comments

Comments
 (0)