Skip to content

Stable v1.9 refine #5608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 11 commits into from
Mar 31, 2022
Merged

Stable v1.9 refine #5608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26181c2
Revert "topology1: CMakefile: add sof-adl-rt711-l2-rt1316-l01"
libinyang Mar 28, 2022
fa6b0f6
Revert "topology1: sof-icl-rt711-rt1308-rt715-hdmi: add NO_LOCAL_MIC …
libinyang Mar 28, 2022
28da495
Revert "topology1: sof-icl-rt711-rt1308-rt715-hdmi: correct the link …
libinyang Mar 28, 2022
c070cda
Revert "topology1: sof-icl-rt711-rt1308-rt715-hdmi: remove NO_AGGREGA…
libinyang Mar 28, 2022
450a4b6
Revert "topology1: soundwire: split headphone pipe in host- and dai-p…
libinyang Mar 28, 2022
e2370f6
Revert "topology1: soundwire: fix misleading comment on ALH buffer fo…
libinyang Mar 28, 2022
7bca31f
Revert "topology1: correct misleading comments for priority/core"
libinyang Mar 28, 2022
86b5bb7
topology1: sof-icl-rt711-rt1308-rt715-hdmi: remove NO_AGGREGATION
libinyang Mar 28, 2022
a5496c6
topology1: sof-icl-rt711-rt1308-rt715-hdmi: correct the link description
libinyang Mar 28, 2022
35f2a62
topology1: sof-icl-rt711-rt1308-rt715-hdmi: add NO_LOCAL_MIC & NOAMP …
libinyang Mar 28, 2022
06c7cb4
topology1: CMakefile: add sof-adl-rt711-l2-rt1316-l01
libinyang Mar 23, 2022
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
12 changes: 6 additions & 6 deletions tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4
View file
Open in desktop
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
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions tools/topology/topology1/development/sof-apl-dmic-a96k-b16k.m4
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions tools/topology/topology1/development/sof-apl-dmic-asymmetric.m4
View file
Open in desktop
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
View file
Open in desktop
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