Skip to content

Commit

Permalink
Revert "topology1: correct misleading comments for priority/core"
Browse files Browse the repository at this point in the history
This reverts commit 22b57a1.

Signed-off-by: Libin Yang <libin.yang@intel.com>
  • Loading branch information
libinyang authored and lgirdwood committed Mar 31, 2022
1 parent 95fb248 commit 012267f
Show file tree
Hide file tree
Showing 75 changed files with 456 additions and 456 deletions.
12 changes: 6 additions & 6 deletions tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)

# Playback pipeline 1 on PCM 0 using max 2 channels of s32le.
# Set 1000us deadline with priority 0 on core 0
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-asrc-volume-playback.m4,
1, 0, 2, s32le,
1000, 0, 0,
8000, 192000, 48000)

# DMIC capture pipeline 2 on PCM 5 using max 2 channels.
# 1000us deadline with priority 0 on core 0
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-asrc-volume-capture.m4,
2, 5, 2, s32le,
1000, 0, 0,
8000, 192000, 48000)

# DMIC16kHz capture pipeline 2 on PCM 6 using max 2 channels.
# 1000us deadline with priority 0 on core 0
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-asrc-volume-capture.m4,
3, 6, 2, s32le,
1000, 0, 0,
Expand All @@ -64,21 +64,21 @@ dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)

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

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

# capture DAI is DMIC16kHz using 2 periods
# Buffers use s16le format, 1000us deadline with priority 0 on core 0
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
3, DMIC, 1, dmic16k,
PIPELINE_SINK_3, 2, s32le,
Expand Down
8 changes: 4 additions & 4 deletions tools/topology/topology1/development/sof-apl-asrc-wm8804.m4
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)

# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
# 1000us deadline with priority 0 on core 0
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-asrc-volume-playback.m4,
1, 0, 2, s32le,
1000, 0, 0,
8000, 48000, 48000)

# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
# 1000us deadline with priority 0 on core 0
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-asrc-capture.m4,
2, 0, 2, s32le,
1000, 0, 0,
Expand All @@ -56,14 +56,14 @@ dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)

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

# capture DAI is SSP5 using 2 periods
# Buffers use s24le format, 1000us deadline with priority 0 on core 0
# Buffers use s24le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
2, SSP, 5, SSP5-Codec,
PIPELINE_SINK_2, 2, s24le,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ dnl dai periods, pcm_min_rate, pcm_max_rate,
dnl pipeline_rate, time_domain)

# Passthrough capture pipeline 6 on PCM 6 using max channels 2.
# Set 1000us deadline with priority 0 on core 0
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
6, 6, 2, s32le,
1000, 0, 0, DMIC, 0, s32le, 3,
96000, 96000, 96000)

# Passthrough capture pipeline 7 on PCM 7 using max channels 2.
# Set 1000us deadline with priority 0 on core 0
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
7, 7, 2, s32le,
1000, 0, 0, DMIC, 1, s32le, 3,
Expand All @@ -61,14 +61,14 @@ dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)

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

# capture DAI is DMIC 1 using 3 periods
# Buffers use s32le format, 1000us deadline with priority 0 on core 0
# 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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)

`# Passthrough capture pipeline 6 on PCM 6 using max channels 'ACHANNEL
# Set 1000us deadline with priority 0 on core 0
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
6, 6, ACHANNEL, AFORMAT,
1000, 0, 0,
ARATE, ARATE, ARATE)

`# Passthrough capture pipeline 7 on PCM 7 using max channels 'BCHANNEL
# Set 1000us deadline with priority 0 on core 0
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture-16khz.m4,
7, 7, BCHANNEL, BFORMAT,
1000, 0, 0,
Expand All @@ -61,14 +61,14 @@ dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)

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

# capture DAI is DMIC 1 using 2 periods
`# Buffers use 'BFORMAT `format, 1000us deadline with priority 0 on core 0'
`# Buffers use 'BFORMAT `format, 1000us deadline on core 0 with priority 0'
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 2, BFORMAT,
Expand Down
8 changes: 4 additions & 4 deletions tools/topology/topology1/development/sof-apl-dmic.m4
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)

# Passthrough capture pipeline 6 on PCM 6 using max channels defined by CHANNELS.
# Set 1000us deadline with priority 0 on core 0
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(PIPE_PROC_CAPTURE,
6, 6, CHANNELS, s32le,
1000, 0, 0,
48000, 48000, 48000)

# Passthrough capture pipeline 7 on PCM 7 using max channels defined by CHANNELS.
# Set 1000us deadline with priority 0 on core 0
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
7, 7, CHANNELS, s32le,
1000, 0, 0,
Expand All @@ -66,14 +66,14 @@ dnl buffer, periods, format,
dnl deadline, priority, core, time_domain)

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

# capture DAI is DMIC 1 using 2 periods
# Buffers use s16le format, 1000us deadline with priority 0 on core 0
# 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, 2, s16le,
Expand Down
Loading

0 comments on commit 012267f

Please sign in to comment.