Skip to content
Merged
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
8 changes: 4 additions & 4 deletions tools/topology/sof-apl-da7219.m4
Original file line number Diff line number Diff line change
Expand Up @@ -108,28 +108,28 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_1, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is SSP1 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
2, SSP, 1, SSP1-Codec,
PIPELINE_SOURCE_2, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is SSP1 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
3, SSP, 1, SSP1-Codec,
PIPELINE_SINK_3, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is DMIC0 using 3 periods
# Buffers use s32le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
4, DMIC, 0, dmic01,
PIPELINE_SINK_4, 3, s32le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is iDisp1 using 2 periods
# Buffers use s32le format, 1000us deadline on core 0 with priority 0
Expand Down
5 changes: 3 additions & 2 deletions tools/topology/sof-apl-demux-pcm512x.m4
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_1, 3, s24le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# currently this dai is here as "virtual" capture backend
W_DAI_IN(SSP, 5, SSP5-Codec, s24le, 3, 0)
Expand All @@ -94,7 +94,8 @@ PIPELINE_PCM_ADD(sof/pipe-passthrough-capture-sched.m4,
5, 4, 2, s32le,
1000, 0, 0,
48000, 48000, 48000,
0, PIPELINE_PLAYBACK_SCHED_COMP_1)
SCHEDULE_TIME_DOMAIN_TIMER,
PIPELINE_PLAYBACK_SCHED_COMP_1)

# Connect demux to capture
SectionGraph."PIPE_CAP" {
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/sof-apl-dmic-a2ch-b2ch.m4
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 3, s32le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is DMIC 1 using 3 periods
# Buffers use s32le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 3, s32le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)


dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/sof-apl-dmic-a2ch-b4ch.m4
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is DMIC 1 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 3, s32le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)


dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-apl-dmic-a2ch.m4
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 3, s32le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
dnl PCM_CAPTURE_ADD(name, pipeline, capture)
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/sof-apl-dmic-a4ch-b2ch.m4
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is DMIC 1 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
dnl PCM_CAPTURE_ADD(name, pipeline, capture)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-apl-dmic-b2ch.m4
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 3, s32le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)


dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/sof-apl-dmic.m4
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 3, s32le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is DMIC 1 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)


dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-apl-eq-dmic.m4
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-capture.m4,
1, DMIC, 0, NoCodec-6,
PIPELINE_SINK_1, 3, s32le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)

Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-apl-eq-pcm512x.m4
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_1, 3, s24le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# PCM Low Latency, id 0
PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1)
Expand Down
5 changes: 3 additions & 2 deletions tools/topology/sof-apl-keyword-detect.m4
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
1, DMIC, 1, NoCodec-6,
PIPELINE_SINK_1, 3, s16le,
KWD_PIPE_SCH_DEADLINE_US,
0, 0)
0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# keyword detector pipe
dnl PIPELINE_ADD(pipeline,
Expand All @@ -68,7 +68,8 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate)
PIPELINE_ADD(sof/pipe-detect.m4,
2, 2, s16le,
KWD_PIPE_SCH_DEADLINE_US, 0, 0,
PIPELINE_SCHED_COMP_1, 0,
PIPELINE_SCHED_COMP_1,
SCHEDULE_TIME_DOMAIN_TIMER,
16000, 16000, 16000)

# Connect pipelines together
Expand Down
29 changes: 15 additions & 14 deletions tools/topology/sof-apl-nocodec.m4
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,16 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 0, NoCodec-0,
PIPELINE_SOURCE_1, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# Media playback pipeline 14 on PCM 7 using max 2 channels of s16le.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
14, 7, 2, s16le,
1000, 0, 0,
48000, 48000, 48000,
0, PIPELINE_PLAYBACK_SCHED_COMP_1)
SCHEDULE_TIME_DOMAIN_TIMER,
PIPELINE_PLAYBACK_SCHED_COMP_1)

# Connect pipelines together
SectionGraph."media-pipeline" {
Expand All @@ -171,84 +172,84 @@ SectionGraph."media-pipeline" {
DAI_ADD(sof/pipe-dai-capture.m4,
2, SSP, 0, NoCodec-0,
PIPELINE_SINK_2, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is SSP1 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
3, SSP, 1, NoCodec-1,
PIPELINE_SOURCE_3, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is SSP1 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
4, SSP, 1, NoCodec-1,
PIPELINE_SINK_4, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is SSP2 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
#DAI_ADD(sof/pipe-dai-playback.m4,
# 5, SSP, 2, NoCodec-2,
# PIPELINE_SOURCE_5, 3, s16le,
# 1000, 0, 0)
# 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is SSP2 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
#DAI_ADD(sof/pipe-dai-capture.m4,
# 6, SSP, 2, NoCodec-2,
# PIPELINE_SINK_6, 3, s16le,
# 1000, 0, 0)
# 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is SSP3 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
7, SSP, 3, NoCodec-3,
PIPELINE_SOURCE_7, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is SSP3 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
8, SSP, 3, NoCodec-3,
PIPELINE_SINK_8, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is SSP4 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
#DAI_ADD(sof/pipe-dai-playback.m4,
# 9, SSP, 4, NoCodec-4,
# PIPELINE_SOURCE_9, 3, s16le,
# 1000, 0, 0)
# 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is SSP4 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
#DAI_ADD(sof/pipe-dai-capture.m4,
# 10, SSP, 4, NoCodec-4,
# PIPELINE_SINK_10, 3, s16le,
# 1000, 0, 0)
# 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is SSP5 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
11, SSP, 5, NoCodec-5,
PIPELINE_SOURCE_11, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is SSP5 using 3 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
12, SSP, 5, NoCodec-5,
PIPELINE_SINK_12, 3, s16le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is DMIC 0 using 3 periods
# Buffers use s32le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
13, DMIC, 0, NoCodec-6,
PIPELINE_SINK_13, 3, s32le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-apl-pcm512x-nohdmi.m4
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_1, 3, s24le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# PCM Low Latency, id 0
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
Expand Down
5 changes: 3 additions & 2 deletions tools/topology/sof-apl-pcm512x.m4
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,16 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_1, 3, s24le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# Media playback pipeline 5 on PCM 4 using max 2 channels of s16le.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
5, 4, 2, s16le,
1000, 0, 0,
8000, 96000, 48000,
0, PIPELINE_PLAYBACK_SCHED_COMP_1)
SCHEDULE_TIME_DOMAIN_TIMER,
PIPELINE_PLAYBACK_SCHED_COMP_1)

# Connect pipelines together
SectionGraph."media-pipeline" {
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-apl-rt298.m4
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_1, 3, s24le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is iDisp1 using 2 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-apl-src-50khz-pcm512x.m4
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_1, 3, s24le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# PCM, id 0
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-apl-src-pcm512x.m4
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dnl deadline, priority, core, time_domain)
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_1, 3, s24le,
1000, 0, 0)
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# PCM, id 0
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
Expand Down
Loading