From 26181c2a1adcdea3dafd3f206a1ee8a765478cd6 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 12:35:08 +0800 Subject: [PATCH 01/11] Revert "topology1: CMakefile: add sof-adl-rt711-l2-rt1316-l01" This reverts commit 5e89b583bfcc07021a89d7dd8bd3564cd53cb5b1. Signed-off-by: Libin Yang --- tools/topology/topology1/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index f90b2167a401..bc4c77474bd1 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -110,7 +110,6 @@ set(TPLGS "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l12-rt714-l0\;-DPLATFORM=adl\;-DNOJACK\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=0" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l3\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=3" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DEXT_AMP_REF\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DEXT_AMP_REF\;-DNO_LOCAL_MIC" "sof-cnl-rt5682-sdw2\;sof-cnl-rt5682-sdw2\;-DPLATFORM=cnl" "sof-cml-rt5682\;sof-cml-rt5682\;-DPLATFORM=cml\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" "sof-cml-rt5682\;sof-whl-rt5682\;-DPLATFORM=whl\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" From fa6b0f6526589fe13a669931acac05ba6f4b3b28 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 12:35:11 +0800 Subject: [PATCH 02/11] Revert "topology1: sof-icl-rt711-rt1308-rt715-hdmi: add NO_LOCAL_MIC & NOAMP support" This reverts commit f892b3186766ce97fd3aa8c51afdd7d4ec620313. Signed-off-by: Libin Yang --- tools/topology/topology1/CMakeLists.txt | 14 ++-- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 68 ++----------------- 2 files changed, 14 insertions(+), 68 deletions(-) diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index bc4c77474bd1..74ff1cf112cb 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -102,14 +102,14 @@ set(TPLGS "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1308-mono-rt715\;-DPLATFORM=tgl\;-DMONO\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DMIC_LINK=3" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt715-rt711-rt1308-mono\;-DPLATFORM=tgl\;-DMONO\;-DUAJ_LINK=1\;-DAMP_1_LINK=2\;-DMIC_LINK=0" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1308-rt715\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1316-rt714\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1316-rt714\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1308-l12-rt715-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l13-rt714-l2\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=3\;-DEXT_AMP_REF\;-DMIC_LINK=2" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l0\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=0" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l12-rt714-l0\;-DPLATFORM=adl\;-DNOJACK\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=0" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l3\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DEXT_AMP_REF\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l13-rt714-l2\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=3\;-DMIC_LINK=2" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l0\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DMIC_LINK=0" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l12-rt714-l0\;-DPLATFORM=adl\;-DNOJACK\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=0" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l3\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DMIC_LINK=3" "sof-cnl-rt5682-sdw2\;sof-cnl-rt5682-sdw2\;-DPLATFORM=cnl" "sof-cml-rt5682\;sof-cml-rt5682\;-DPLATFORM=cml\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" "sof-cml-rt5682\;sof-whl-rt5682\;-DPLATFORM=whl\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 index ede9b41debd9..475867efcdc1 100644 --- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -31,33 +31,6 @@ ifdef(`AMP_2_LINK',`', ifdef(`MIC_LINK',`', `define(MIC_LINK, `3')') -# UAJ ID: 0, 1 -# AMP ID: 2, 3 (if EXT_AMP_REF defined) -# DMIC ID: 4 -# HDMI ID calculated based on the configuraiton -define(HDMI_BE_ID_BASE, `0') - -ifdef(`NO_JACK', `', - `undefine(`HDMI_BE_ID_BASE') - define(HDMI_BE_ID_BASE, `2')' -) - -ifdef(`NOAMP', `', - `undefine(`HDMI_BE_ID_BASE') - define(HDMI_BE_ID_BASE, `3')' -) - -ifdef(`EXT_AMP_REF', - `undefine(`HDMI_BE_ID_BASE') - define(HDMI_BE_ID_BASE, `4')', - `' -) - -ifdef(`NO_LOCAL_MIC', `', - `undefine(`HDMI_BE_ID_BASE') - define(HDMI_BE_ID_BASE, `5')' -) - DEBUG_START dnl Configure demux @@ -67,8 +40,6 @@ dnl copied to corresponding output channels in all output streams. dnl I.e. row index is the input channel, 1 means it is copied to dnl corresponding output channel (column index), 0 means it is discarded. dnl There's a separate matrix for all outputs. -ifdef(`NOAMP', `', -` ifdef(`MONO', `', ` define(matrix1, `ROUTE_MATRIX(3, @@ -94,7 +65,6 @@ define(matrix2, `ROUTE_MATRIX(4, dnl name, num_streams, route_matrix list MUXDEMUX_CONFIG(demux_priv_3, 2, LIST(` ', `matrix1,', `matrix2')) ') -') # # Define the pipelines @@ -104,14 +74,10 @@ ifdef(`NOJACK', `', # PCM0 ---> volume ----> mixer --->ALH 2 BE UAJ_LINK # PCM1 <--- volume <---- ALH 3 BE UAJ_LINK ') -ifdef(`NOAMP', `', -` # PCM2 ---> volume ----> ALH 2 BE AMP_1_LINK ifdef(`MONO', `', `# PCM40 ---> volume ----> ALH 2 BE AMP_2_LINK') -') -ifdef(`NO_LOCAL_MIC', `', -`# PCM4 <--- volume <---- ALH 2 BE MIC_LINK') +# PCM4 <--- volume <---- ALH 2 BE MIC_LINK # PCM5 ---> volume ----> iDisp1 # PCM6 ---> volume ----> iDisp2 # PCM7 ---> volume ----> iDisp3 @@ -132,8 +98,6 @@ PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 48000, 48000, 48000) ') -ifdef(`NOAMP', `', -` ifdef(`MONO', ` # Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le. @@ -158,17 +122,13 @@ PIPELINE_PCM_ADD(sof/pipe-dai-endpoint.m4, 1000, 0, 0, 48000, 48000, 48000) ') -') -ifdef(`NO_LOCAL_MIC', `', -` # Low Latency capture pipeline 5 on PCM 4 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline with priority 0 on core 0 PIPELINE_PCM_ADD(sof/pipe-highpass-switch-capture.m4, 5, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) -') # Low Latency playback pipeline 6 on PCM 5 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline with priority 0 on core 0 @@ -239,8 +199,6 @@ SectionGraph."mixer-host" { ' ) -ifdef(`NOAMP', `', -` # playback DAI is ALH(AMP_1_LINK PIN2/AMP_2_LINK PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, @@ -265,17 +223,13 @@ SectionGraph."PIPE_DEMUX" { ] } ') -') -ifdef(`NO_LOCAL_MIC', `', -` # capture DAI is ALH(MIC_LINK PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 5, ALH, eval(MIC_LINK * 256 + 2), `SDW'eval(MIC_LINK)`-Capture', PIPELINE_SINK_5, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) -') # playback DAI is iDisp1 using 2 periods # # Buffers use s32le format, 1000us deadline with priority 0 on core 0 @@ -306,11 +260,9 @@ ifdef(`NOJACK', `', PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_30) PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2) ') -ifdef(`NOAMP', `', -` + PCM_PLAYBACK_ADD(Speaker, 2, PIPELINE_PCM_3) -') -ifdef(`NO_LOCAL_MIC', `', `PCM_CAPTURE_ADD(Microphone, 4, PIPELINE_PCM_5)') +PCM_CAPTURE_ADD(Microphone, 4, PIPELINE_PCM_5) PCM_PLAYBACK_ADD(HDMI 1, 5, PIPELINE_PCM_6) PCM_PLAYBACK_ADD(HDMI 2, 6, PIPELINE_PCM_7) PCM_PLAYBACK_ADD(HDMI 3, 7, PIPELINE_PCM_8) @@ -331,26 +283,20 @@ DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 3), 48000, 2))) ') -ifdef(`NOAMP', `', -` #ALH AMP_1_LINK Pin2 (ID: 2) DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2))) -') -ifdef(`NO_LOCAL_MIC', `', -` #ALH MIC_LINK Pin2 (ID: 4) DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2))) -') -# 3 HDMI/DP outputs (ID: from HDMI_BE_ID_BASE) -DAI_CONFIG(HDA, 0, HDMI_BE_ID_BASE, iDisp1, +# 3 HDMI/DP outputs (ID: 5,6,7) +DAI_CONFIG(HDA, 0, 5, iDisp1, HDA_CONFIG(HDA_CONFIG_DATA(HDA, 0, 48000, 2))) -DAI_CONFIG(HDA, 1, eval(HDMI_BE_ID_BASE + 1), iDisp2, +DAI_CONFIG(HDA, 1, 6, iDisp2, HDA_CONFIG(HDA_CONFIG_DATA(HDA, 1, 48000, 2))) -DAI_CONFIG(HDA, 2, eval(HDMI_BE_ID_BASE + 2), iDisp3, +DAI_CONFIG(HDA, 2, 7, iDisp3, HDA_CONFIG(HDA_CONFIG_DATA(HDA, 2, 48000, 2))) DEBUG_END From 28da49512d69af9ce8b7e08c6a99059bf6866e99 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 12:35:13 +0800 Subject: [PATCH 03/11] Revert "topology1: sof-icl-rt711-rt1308-rt715-hdmi: correct the link description" This reverts commit ee3631ae87a9eb639524df2bf269746804e14116. Signed-off-by: Libin Yang --- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 index 475867efcdc1..e56358e296f4 100644 --- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -71,13 +71,13 @@ MUXDEMUX_CONFIG(demux_priv_3, 2, LIST(` ', `matrix1,', `matrix2')) # ifdef(`NOJACK', `', ` -# PCM0 ---> volume ----> mixer --->ALH 2 BE UAJ_LINK -# PCM1 <--- volume <---- ALH 3 BE UAJ_LINK +# PCM0 ---> volume ----> mixer --->ALH 2 BE dailink 0 +# PCM1 <--- volume <---- ALH 3 BE dailink 1 ') -# PCM2 ---> volume ----> ALH 2 BE AMP_1_LINK +# PCM2 ---> volume ----> ALH 2 BE dailink 2 ifdef(`MONO', `', -`# PCM40 ---> volume ----> ALH 2 BE AMP_2_LINK') -# PCM4 <--- volume <---- ALH 2 BE MIC_LINK +`# PCM40 ---> volume ----> ALH 2 BE dailink 3') +# PCM4 <--- volume <---- ALH 2 BE dailink 4 # PCM5 ---> volume ----> iDisp1 # PCM6 ---> volume ----> iDisp2 # PCM7 ---> volume ----> iDisp3 @@ -162,7 +162,7 @@ dnl deadline, priority, core, time_domain) ifdef(`NOJACK', `', ` -# playback DAI is ALH(UAJ_LINK PIN2) using 2 periods +# playback DAI is ALH(SDW0 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 # The NOT_USED_IGNORED is due to dependencies and is adjusted later with an explicit dapm line. @@ -171,7 +171,7 @@ DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4, NOT_USE_IGNORED, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, 48000) -# capture DAI is ALH(UAJ_LINK PIN3) using 2 periods +# capture DAI is ALH(SDW0 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, ALH, eval(UAJ_LINK * 256 + 3), `SDW'eval(UAJ_LINK)`-Capture', @@ -199,7 +199,7 @@ SectionGraph."mixer-host" { ' ) -# playback DAI is ALH(AMP_1_LINK PIN2/AMP_2_LINK PIN2) using 2 periods +# playback DAI is ALH(SDW1 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, ALH, eval(AMP_1_LINK * 256 + 2), `SDW'eval(AMP_1_LINK)`-Playback', @@ -224,7 +224,7 @@ SectionGraph."PIPE_DEMUX" { } ') -# capture DAI is ALH(MIC_LINK PIN2) using 2 periods +# capture DAI is ALH(SDW3 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 5, ALH, eval(MIC_LINK * 256 + 2), `SDW'eval(MIC_LINK)`-Capture', @@ -274,20 +274,20 @@ PCM_PLAYBACK_ADD(HDMI 3, 7, PIPELINE_PCM_8) ifdef(`NOJACK', `', ` #ALH dai index = ((link_id << 8) | PDI id) -#ALH UAJ_LINK Pin2 (ID: 0) +#ALH SDW0 Pin2 (ID: 0) DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 2), 0, `SDW'eval(UAJ_LINK)`-Playback', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 2), 48000, 2))) -#ALH UAJ_LINK Pin3 (ID: 1) +#ALH SDW0 Pin3 (ID: 1) DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 3), 48000, 2))) ') -#ALH AMP_1_LINK Pin2 (ID: 2) +#ALH SDW1 Pin2 (ID: 2) DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2))) -#ALH MIC_LINK Pin2 (ID: 4) +#ALH SDW3 Pin2 (ID: 4) DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2))) From c070cda6a763e7f03a2753f261733bf789475ea2 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 12:35:14 +0800 Subject: [PATCH 04/11] Revert "topology1: sof-icl-rt711-rt1308-rt715-hdmi: remove NO_AGGREGATION" This reverts commit 390475661303ecdb58c8c71a5d9b021f1fc7733e. Signed-off-by: Libin Yang --- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 index e56358e296f4..d68058b20776 100644 --- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -110,14 +110,16 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, ` # Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline with priority 0 on core 0 -PIPELINE_PCM_ADD(sof/pipe-volume-demux-playback.m4, +PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION',`sof/pipe-volume-playback.m4', + `sof/pipe-volume-demux-playback.m4'), 3, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 40 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline with priority 0 on core 0 -PIPELINE_PCM_ADD(sof/pipe-dai-endpoint.m4, +PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION', `sof/pipe-volume-playback.m4', + `sof/pipe-dai-endpoint.m4'), 4, 40, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) @@ -206,7 +208,14 @@ DAI_ADD(sof/pipe-dai-playback.m4, PIPELINE_SOURCE_3, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) -ifdef(`MONO', `', +ifdef(`NO_AGGREGATION', +`# playback DAI is ALH(SDW2 PIN2) using 2 periods +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 4, ALH, eval(AMP_2_LINK * 256 + 2), `SDW'eval(AMP_2_LINK)`-Playback', + PIPELINE_SOURCE_4, 2, s24le, + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)', +`ifdef(`MONO', `', `DAI_ADD_SCHED(sof/pipe-dai-sched-playback.m4, 4, ALH, eval(AMP_2_LINK * 256 + 2), `SDW'eval(AMP_1_LINK)`-Playback', PIPELINE_SOURCE_4, 2, s24le, @@ -222,7 +231,7 @@ SectionGraph."PIPE_DEMUX" { dapm(PIPELINE_SOURCE_4, PIPELINE_DEMUX_3) ] } -') +')') # capture DAI is ALH(SDW3 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 @@ -262,6 +271,7 @@ PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2) ') PCM_PLAYBACK_ADD(Speaker, 2, PIPELINE_PCM_3) +ifdef(`NO_AGGREGATION', `PCM_PLAYBACK_ADD(Speaker 2, 40, PIPELINE_PCM_4)',`') PCM_CAPTURE_ADD(Microphone, 4, PIPELINE_PCM_5) PCM_PLAYBACK_ADD(HDMI 1, 5, PIPELINE_PCM_6) PCM_PLAYBACK_ADD(HDMI 2, 6, PIPELINE_PCM_7) @@ -287,6 +297,12 @@ DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture', DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2))) +ifdef(`NO_AGGREGATION', +`#ALH SDW2 Pin2 (ID: 3) +DAI_CONFIG(ALH, eval(AMP_2_LINK * 256 + 2), 3, `SDW'eval(AMP_2_LINK)`-Playback', + ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_2_LINK * 256 + 2), 48000, 2)))', +`') + #ALH SDW3 Pin2 (ID: 4) DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2))) From 450a4b6d9db87bda5efad492e87f5c92406b195c Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 12:35:16 +0800 Subject: [PATCH 05/11] Revert "topology1: soundwire: split headphone pipe in host- and dai-parts" This reverts commit 748b3cae8d67309fd9facb0c82c578d125e7275e. Signed-off-by: Libin Yang --- tools/topology/topology1/sof-cml-rt700.m4 | 35 ++++++---------- tools/topology/topology1/sof-icl-rt700.m4 | 35 ++++++---------- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 41 ++++++------------- .../topology1/sof-tgl-rt711-rt1308.m4 | 41 ++++++++----------- 4 files changed, 55 insertions(+), 97 deletions(-) diff --git a/tools/topology/topology1/sof-cml-rt700.m4 b/tools/topology/topology1/sof-cml-rt700.m4 index a6306b206ab1..3da118c0305d 100644 --- a/tools/topology/topology1/sof-cml-rt700.m4 +++ b/tools/topology/topology1/sof-cml-rt700.m4 @@ -45,7 +45,7 @@ DEBUG_START # # Define the pipelines # -# PCM0 ---> volume ----> mixer --->ALH 2 BE dailink 0 +# PCM0 ---> volume ----> ALH 2 BE dailink 0 # PCM1 <--- volume <---- ALH 3 BE dailink 1 # PCM10 <---------------- DMIC01 (dmic0 capture, BE dailink 2) # PCM11 <---------------- DMIC16k (dmic16k, BE dailink 3) @@ -60,6 +60,13 @@ dnl period, priority, core, 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. +# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, + 1, 0, 2, s24le, + 1000, 0, 0, + 48000, 48000, 48000) + # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline with priority 0 on core 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, @@ -99,10 +106,10 @@ dnl deadline, priority, core, time_domain) # playback DAI is ALH(SDW1 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4, +DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, 0x102, SDW1-Playback, - NOT_USED_IGNORED, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, 48000) + PIPELINE_SOURCE_1, 2, s24le, + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW1 PIN3) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 @@ -111,24 +118,6 @@ DAI_ADD(sof/pipe-dai-capture.m4, PIPELINE_SINK_2, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) -# Low Latency playback pipeline 30 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, - 30, 0, 2, s32le, - 1000, 0, 0, - 48000, 48000, 48000, - SCHEDULE_TIME_DOMAIN_TIMER, - PIPELINE_PLAYBACK_SCHED_COMP_1) - -SectionGraph."mixer-host" { - index "0" - - lines [ - # connect mixer dai pipelines to PCM pipelines - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30) - ] -} - # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, @@ -152,7 +141,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # PCM Low Latency, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) -PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_30) +PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_1) PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2) PCM_PLAYBACK_ADD(HDMI 1, 5, PIPELINE_PCM_6) PCM_PLAYBACK_ADD(HDMI 2, 6, PIPELINE_PCM_7) diff --git a/tools/topology/topology1/sof-icl-rt700.m4 b/tools/topology/topology1/sof-icl-rt700.m4 index dabff79dbd91..09e7acac1ddb 100644 --- a/tools/topology/topology1/sof-icl-rt700.m4 +++ b/tools/topology/topology1/sof-icl-rt700.m4 @@ -45,7 +45,7 @@ DEBUG_START # # Define the pipelines # -# PCM0 ---> volume ----> mixer --->ALH 2 BE dailink 0 +# PCM0 ---> volume ----> ALH 2 BE dailink 0 # PCM1 <--- volume <---- ALH 3 BE dailink 1 # PCM10 <---------------- DMIC01 (dmic0 capture, BE dailink 2) # PCM11 <---------------- DMIC16k (dmic16k, BE dailink 3) @@ -60,6 +60,13 @@ dnl period, priority, core, 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. +# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, + 1, 0, 2, s24le, + 1000, 0, 0, + 48000, 48000, 48000) + # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline with priority 0 on core 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, @@ -99,10 +106,10 @@ dnl deadline, priority, core, time_domain) # playback DAI is ALH(SDW0 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4, +DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, 2, SDW0-Playback, - NOT_USED_IGNORED, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, 48000) + PIPELINE_SOURCE_1, 2, s24le, + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW0 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 @@ -111,24 +118,6 @@ DAI_ADD(sof/pipe-dai-capture.m4, PIPELINE_SINK_2, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) -# Low Latency playback pipeline 30 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, - 30, 0, 2, s32le, - 1000, 0, 0, - 48000, 48000, 48000, - SCHEDULE_TIME_DOMAIN_TIMER, - PIPELINE_PLAYBACK_SCHED_COMP_1) - -SectionGraph."mixer-host" { - index "0" - - lines [ - # connect mixer dai pipelines to PCM pipelines - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30) - ] -} - # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, @@ -152,7 +141,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # PCM Low Latency, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) -PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_30) +PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_1) PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2) PCM_PLAYBACK_ADD(HDMI 1, 5, PIPELINE_PCM_6) PCM_PLAYBACK_ADD(HDMI 2, 6, PIPELINE_PCM_7) diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 index d68058b20776..5c1dff936517 100644 --- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -71,7 +71,7 @@ MUXDEMUX_CONFIG(demux_priv_3, 2, LIST(` ', `matrix1,', `matrix2')) # ifdef(`NOJACK', `', ` -# PCM0 ---> volume ----> mixer --->ALH 2 BE dailink 0 +# PCM0 ---> volume ----> ALH 2 BE dailink 0 # PCM1 <--- volume <---- ALH 3 BE dailink 1 ') # PCM2 ---> volume ----> ALH 2 BE dailink 2 @@ -90,6 +90,13 @@ dnl time_domain, sched_comp) ifdef(`NOJACK', `', ` +# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, + 1, 0, 2, s32le, + 1000, 0, 0, + 48000, 48000, 48000) + # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline with priority 0 on core 0 PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, @@ -166,12 +173,10 @@ ifdef(`NOJACK', `', ` # playback DAI is ALH(SDW0 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 -# The NOT_USED_IGNORED is due to dependencies and is adjusted later with an explicit dapm line. - -DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4, +DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, eval(UAJ_LINK * 256 + 2), `SDW'eval(UAJ_LINK)`-Playback', - NOT_USE_IGNORED, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, 48000) + PIPELINE_SOURCE_1, 2, s24le, + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW0 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 @@ -179,27 +184,7 @@ DAI_ADD(sof/pipe-dai-capture.m4, 2, ALH, eval(UAJ_LINK * 256 + 3), `SDW'eval(UAJ_LINK)`-Capture', PIPELINE_SINK_2, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) - -# Low Latency playback pipeline 30 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, - 30, 0, 2, s32le, - 1000, 0, 0, - 48000, 48000, 48000, - SCHEDULE_TIME_DOMAIN_TIMER, - PIPELINE_PLAYBACK_SCHED_COMP_1) - -SectionGraph."mixer-host" { - index "0" - - lines [ - # connect mixer dai pipelines to PCM pipelines - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30) - ] -} - -' -) +') # playback DAI is ALH(SDW1 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 @@ -266,7 +251,7 @@ dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) ifdef(`NOJACK', `', ` -PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_30) +PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_1) PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2) ') diff --git a/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 b/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 index b6be8109c0af..48a1d26342aa 100644 --- a/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 +++ b/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 @@ -96,7 +96,7 @@ DEBUG_START # # Define the pipelines # -# PCM0 ---> volume ----> mixer --->ALH 2 BE dailink 0 +# PCM0 ---> volume ----> ALH 2 BE dailink 0 # PCM1 <--- volume <---- ALH 3 BE dailink 1 ifdef(`EXT_AMP', ` # PCM2 ---> volume ----> ALH 2 BE dailink 2 @@ -111,6 +111,19 @@ ifelse(PLATFORM, `adl', ` # PCM14 <---> passthrough <---> SSP2 BT playback/capture ', `') +dnl PIPELINE_PCM_ADD(pipeline, +dnl pipe id, pcm, max channels, format, +dnl period, priority, core, +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. +# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, + 1, 0, 2, s32le, + 1000, 0, 0, + 48000, 48000, 48000) + # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline with priority 0 on core 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, @@ -166,10 +179,10 @@ dnl deadline, priority, core, time_domain) # playback DAI is ALH(SDW0 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4, +DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, 2, SDW0-Playback, - NOT_USED_IGNORED, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, 48000) + PIPELINE_SOURCE_1, 2, s24le, + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW0 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 @@ -178,24 +191,6 @@ DAI_ADD(sof/pipe-dai-capture.m4, PIPELINE_SINK_2, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) -# Low Latency playback pipeline 30 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, - 30, 0, 2, s32le, - 1000, 0, 0, - 48000, 48000, 48000, - SCHEDULE_TIME_DOMAIN_TIMER, - PIPELINE_PLAYBACK_SCHED_COMP_1) - -SectionGraph."mixer-host" { - index "0" - - lines [ - # connect mixer dai pipelines to PCM pipelines - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30) - ] -} - ifdef(`EXT_AMP', ` # playback DAI is ALH(SDW1 PIN2) using 2 periods @@ -236,7 +231,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # PCM Low Latency, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) -PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_30) +PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_1) PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2) ifdef(`EXT_AMP', ` From e2370f61174aa831bd9ac543d9dfba0969a07f04 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 12:35:17 +0800 Subject: [PATCH 06/11] Revert "topology1: soundwire: fix misleading comment on ALH buffer format" This reverts commit 93bf38497023a366b372311638747197b0d1b8d9. Signed-off-by: Libin Yang --- tools/topology/topology1/sof-cml-rt700.m4 | 4 ++-- tools/topology/topology1/sof-icl-rt700.m4 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/topology/topology1/sof-cml-rt700.m4 b/tools/topology/topology1/sof-cml-rt700.m4 index 3da118c0305d..ef2ac9ae23e6 100644 --- a/tools/topology/topology1/sof-cml-rt700.m4 +++ b/tools/topology/topology1/sof-cml-rt700.m4 @@ -105,14 +105,14 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is ALH(SDW1 PIN2) using 2 periods -# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, 0x102, SDW1-Playback, PIPELINE_SOURCE_1, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW1 PIN3) using 2 periods -# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, ALH, 0x103, SDW1-Capture, PIPELINE_SINK_2, 2, s24le, diff --git a/tools/topology/topology1/sof-icl-rt700.m4 b/tools/topology/topology1/sof-icl-rt700.m4 index 09e7acac1ddb..3f17de80891a 100644 --- a/tools/topology/topology1/sof-icl-rt700.m4 +++ b/tools/topology/topology1/sof-icl-rt700.m4 @@ -105,14 +105,14 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is ALH(SDW0 PIN2) using 2 periods -# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, 2, SDW0-Playback, PIPELINE_SOURCE_1, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW0 PIN2) using 2 periods -# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, ALH, 3, SDW0-Capture, PIPELINE_SINK_2, 2, s24le, From 7bca31f7dd60b9f96a627fab0468d35e6a71fa03 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 12:35:19 +0800 Subject: [PATCH 07/11] Revert "topology1: correct misleading comments for priority/core" This reverts commit 22b57a186b120b36e568d4d12daeaf620a2b6511. Signed-off-by: Libin Yang --- .../development/sof-apl-asrc-pcm512x.m4 | 12 ++--- .../development/sof-apl-asrc-wm8804.m4 | 8 +-- .../development/sof-apl-dmic-a96k-b16k.m4 | 8 +-- .../development/sof-apl-dmic-asymmetric.m4 | 8 +-- .../topology1/development/sof-apl-dmic.m4 | 8 +-- .../development/sof-apl-nocodec-ci.m4 | 54 +++++++++---------- .../sof-apl-nocodec-demux-eq-2ch4ch.m4 | 8 +-- .../sof-apl-nocodec-demux-eq-4ch4ch.m4 | 8 +-- .../development/sof-apl-pcm512x-nohdmi.m4 | 4 +- .../development/sof-apl-src-50khz-pcm512x.m4 | 2 +- .../sof-cml-rt1011-rt5682-nokwd.m4 | 12 ++--- .../development/sof-cml-src-rt5682.m4 | 24 ++++----- .../topology1/development/sof-hda-asrc.m4 | 28 +++++----- .../development/sof-imx8-compr-aac-wm8960.m4 | 2 +- .../development/sof-imx8-compr-mp3-wm8960.m4 | 2 +- .../development/sof-imx8-src-cs42888.m4 | 4 +- .../development/sof-imx8-src-wm8960.m4 | 4 +- .../sof-imx8mp-compr-aac-wm8960.m4 | 2 +- .../sof-imx8mp-compr-mp3-wm8960.m4 | 2 +- .../development/sof-imx8mp-src-wm8960.m4 | 4 +- .../development/sof-tgl-nocodec-ci.m4 | 10 ++-- .../topology/topology1/platform/intel/cml.m4 | 4 +- .../platform/intel/intel-generic-dmic-kwd.m4 | 6 +-- .../platform/intel/intel-generic-dmic.m4 | 6 +-- tools/topology/topology1/sof-apl-da7219.m4 | 28 +++++----- .../topology1/sof-apl-demux-pcm512x.m4 | 16 +++--- .../topology1/sof-apl-keyword-detect.m4 | 2 +- tools/topology/topology1/sof-apl-pcm512x.m4 | 22 ++++---- tools/topology/topology1/sof-apl-rt298.m4 | 16 +++--- tools/topology/topology1/sof-apl-tdf8532.m4 | 40 +++++++------- tools/topology/topology1/sof-apl-wm8804.m4 | 8 +-- tools/topology/topology1/sof-bdw-codec.m4 | 8 +-- tools/topology/topology1/sof-bdw-nocodec.m4 | 8 +-- tools/topology/topology1/sof-byt-codec.m4 | 8 +-- tools/topology/topology1/sof-cavs-nocodec.m4 | 14 ++--- tools/topology/topology1/sof-cht-max98090.m4 | 8 +-- tools/topology/topology1/sof-cht-nocodec.m4 | 8 +-- .../topology1/sof-cml-demux-rt5682.m4 | 24 ++++----- .../topology1/sof-cml-rt1011-rt5682.m4 | 2 +- .../topology/topology1/sof-cml-rt5682-kwd.m4 | 14 ++--- tools/topology/topology1/sof-cml-rt5682.m4 | 26 ++++----- tools/topology/topology1/sof-cml-rt700.m4 | 10 ++-- tools/topology/topology1/sof-cnl-rt274.m4 | 8 +-- .../topology/topology1/sof-cnl-rt5682-sdw2.m4 | 16 +++--- tools/topology/topology1/sof-ehl-rt5660.m4 | 16 +++--- .../topology/topology1/sof-glk-da7219-kwd.m4 | 30 +++++------ tools/topology/topology1/sof-glk-da7219.m4 | 32 +++++------ tools/topology/topology1/sof-glk-es8336.m4 | 20 +++---- tools/topology/topology1/sof-glk-rt5682.m4 | 28 +++++----- .../topology1/sof-hda-generic-idisp.m4 | 12 ++--- .../topology/topology1/sof-hda-generic-kwd.m4 | 28 +++++----- tools/topology/topology1/sof-hda-generic.m4 | 28 +++++----- tools/topology/topology1/sof-icl-dmic-4ch.m4 | 4 +- tools/topology/topology1/sof-icl-rt700.m4 | 10 ++-- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 24 ++++----- .../topology1/sof-imx8-cs42888-mixer.m4 | 8 +-- tools/topology/topology1/sof-imx8-cs42888.m4 | 4 +- .../topology1/sof-imx8-nocodec-sai.m4 | 2 +- tools/topology/topology1/sof-imx8-nocodec.m4 | 2 +- .../topology/topology1/sof-imx8-wm8960-kwd.m4 | 2 +- .../topology1/sof-imx8-wm8960-mixer.m4 | 8 +-- tools/topology/topology1/sof-imx8-wm8960.m4 | 4 +- .../topology1/sof-imx8mp-wm8960-kwd.m4 | 2 +- .../topology1/sof-imx8mp-wm8960-mixer.m4 | 8 +-- tools/topology/topology1/sof-imx8mp-wm8960.m4 | 4 +- tools/topology/topology1/sof-imx8ulp-btsco.m4 | 4 +- tools/topology/topology1/sof-jsl-da7219.m4 | 10 ++-- tools/topology/topology1/sof-jsl-rt5682.m4 | 12 ++--- .../sof-mt8195-mt6359-rt1019-rt5682.m4 | 8 +-- .../topology/topology1/sof-smart-amplifier.m4 | 12 ++--- .../sof-tgl-max98357a-rt5682-rtnr-16kHz.m4 | 14 ++--- .../topology1/sof-tgl-max98357a-rt5682.m4 | 14 ++--- .../topology1/sof-tgl-max98373-rt5682.m4 | 14 ++--- .../topology1/sof-tgl-rt711-rt1308.m4 | 20 +++---- .../topology1/sof-tgl-sdw-max98373-rt5682.m4 | 12 ++--- 75 files changed, 456 insertions(+), 456 deletions(-) diff --git a/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 b/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 index 55ded863956b..4c545791d591 100644 --- a/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 +++ b/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 @@ -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, @@ -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, diff --git a/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 b/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 index 8ed5e009e88b..67eda41d8c24 100644 --- a/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 +++ b/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 @@ -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, @@ -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, diff --git a/tools/topology/topology1/development/sof-apl-dmic-a96k-b16k.m4 b/tools/topology/topology1/development/sof-apl-dmic-a96k-b16k.m4 index 9efc11bef416..7254dd85736a 100644 --- a/tools/topology/topology1/development/sof-apl-dmic-a96k-b16k.m4 +++ b/tools/topology/topology1/development/sof-apl-dmic-a96k-b16k.m4 @@ -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, @@ -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, diff --git a/tools/topology/topology1/development/sof-apl-dmic-asymmetric.m4 b/tools/topology/topology1/development/sof-apl-dmic-asymmetric.m4 index af4f3e9056f6..7065bc989b03 100644 --- a/tools/topology/topology1/development/sof-apl-dmic-asymmetric.m4 +++ b/tools/topology/topology1/development/sof-apl-dmic-asymmetric.m4 @@ -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, @@ -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, diff --git a/tools/topology/topology1/development/sof-apl-dmic.m4 b/tools/topology/topology1/development/sof-apl-dmic.m4 index 339c93d071ac..e9ba9d73c105 100644 --- a/tools/topology/topology1/development/sof-apl-dmic.m4 +++ b/tools/topology/topology1/development/sof-apl-dmic.m4 @@ -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, @@ -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, diff --git a/tools/topology/topology1/development/sof-apl-nocodec-ci.m4 b/tools/topology/topology1/development/sof-apl-nocodec-ci.m4 index b8d063fea9d2..25210fc4483b 100644 --- a/tools/topology/topology1/development/sof-apl-nocodec-ci.m4 +++ b/tools/topology/topology1/development/sof-apl-nocodec-ci.m4 @@ -41,91 +41,91 @@ 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 s16le. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Volume switch capture pipeline 2 on PCM 0 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 1 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 3, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Volume switch capture pipeline 4 on PCM 1 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 4, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 2 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 #PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, # 5, 2, 2, s32le, # 1000, 0, 0, # 48000, 48000, 48000) # Volume switch capture pipeline 6 on PCM 2 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 #PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, # 6, 2, 2, s32le, # 1000, 0, 0, # 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 3 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Volume switch capture pipeline 8 on PCM 3 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 8, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 9 on PCM 4 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 #PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, # 9, 4, 2, s32le, # 1000, 0, 0, # 48000, 48000, 48000) # Volume switch capture pipeline 10 on PCM 4 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 #PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, # 10, 4, 2, s32le, # 1000, 0, 0, # 48000, 48000, 48000) # Low Latency playback pipeline 11 on PCM 5 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 11, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Volume switch capture pipeline 12 on PCM 5 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 12, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Passthrough capture pipeline 13 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-passthrough-capture.m4, 13, 6, 2, s32le, 1000, 0, 0, @@ -141,14 +141,14 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP0 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-playback.m4, 1, SSP, 0, NoCodec-0, PIPELINE_SOURCE_1, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # Media playback pipeline 14 on PCM 7 using max 2 channels of s16le. -# Set 4000us deadline with priority 0 on core 0 +# Set 4000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 14, 7, 2, s16le, 4000, 0, 0, @@ -167,84 +167,84 @@ SectionGraph."media-pipeline" { } # capture DAI is SSP0 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, 2, SSP, 0, NoCodec-0, PIPELINE_SINK_2, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP1 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-playback.m4, 3, SSP, 1, NoCodec-1, PIPELINE_SOURCE_3, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 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, 4, SSP, 1, NoCodec-1, PIPELINE_SINK_4, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP2 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-playback.m4, # 5, SSP, 2, NoCodec-2, # PIPELINE_SOURCE_5, 2, s16le, # 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 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, # 6, SSP, 2, NoCodec-2, # PIPELINE_SINK_6, 2, s16le, # 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP3 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-playback.m4, 7, SSP, 3, NoCodec-3, PIPELINE_SOURCE_7, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP3 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, 8, SSP, 3, NoCodec-3, PIPELINE_SINK_8, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP4 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-playback.m4, # 9, SSP, 4, NoCodec-4, # PIPELINE_SOURCE_9, 2, s16le, # 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP4 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, # 10, SSP, 4, NoCodec-4, # PIPELINE_SINK_10, 2, s16le, # 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP5 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-playback.m4, 11, SSP, 5, NoCodec-5, PIPELINE_SOURCE_11, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP5 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, 12, SSP, 5, NoCodec-5, PIPELINE_SINK_12, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # 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, 13, DMIC, 0, NoCodec-6, PIPELINE_SINK_13, 2, s32le, diff --git a/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4 b/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4 index c15cc57476fe..e3d99a002264 100644 --- a/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4 +++ b/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4 @@ -35,14 +35,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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-demux-eq-iir-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Volume switch capture pipeline 2 on PCM 0 using max 4 channels of s32le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 2, 0, 4, s32le, 1000, 0, 0, @@ -59,7 +59,7 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP0 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-playback.m4, 1, SSP, 0, NoCodec-0, PIPELINE_SOURCE_1, 4, s32le, @@ -67,7 +67,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP0 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, SSP, 0, NoCodec-0, PIPELINE_SINK_2, 4, s32le, diff --git a/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4 b/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4 index 5e364457d849..969433aab468 100644 --- a/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4 +++ b/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4 @@ -35,14 +35,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 4 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-demux-eq-iir-playback.m4, 1, 0, 4, s32le, 1000, 0, 0, 48000, 48000, 48000) # Volume switch capture pipeline 2 on PCM 0 using max 4 channels of s32le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 2, 0, 4, s32le, 1000, 0, 0, @@ -59,7 +59,7 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP0 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-playback.m4, 1, SSP, 0, NoCodec-0, PIPELINE_SOURCE_1, 4, s32le, @@ -67,7 +67,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP0 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, SSP, 0, NoCodec-0, PIPELINE_SINK_2, 4, s32le, diff --git a/tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 b/tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 index 4e3814745ac6..d3c728175053 100644 --- a/tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 +++ b/tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 @@ -41,7 +41,7 @@ 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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(PIPE_PROC_PLAYBACK, 1, 0, 2, s32le, 1000, 0, 0, @@ -57,7 +57,7 @@ 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, diff --git a/tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 b/tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 index 4833bca55f30..f5f2b25083e1 100644 --- a/tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 +++ b/tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 @@ -33,7 +33,7 @@ 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 s24le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, diff --git a/tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 b/tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 index 16aaf5b82923..984f76943f13 100644 --- a/tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 +++ b/tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 @@ -61,7 +61,7 @@ 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 s24le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 ifdef(`HSEARPROC_FILTER1', `define(PIPELINE_FILTER1, HSEARPROC_FILTER1)', `undefine(`PIPELINE_FILTER1')') ifdef(`HSEARPROC_FILTER2', `define(PIPELINE_FILTER2, HSEARPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') PIPELINE_PCM_ADD(sof/pipe-HSEARPROC-playback.m4, @@ -72,7 +72,7 @@ undefine(`PIPELINE_FILTER1') undefine(`PIPELINE_FILTER2') # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 ifdef(`HSMICPROC_FILTER1', `define(PIPELINE_FILTER1, HSMICPROC_FILTER1)', `undefine(`PIPELINE_FILTER1')') ifdef(`HSMICPROC_FILTER2', `define(PIPELINE_FILTER2, HSMICPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') PIPELINE_PCM_ADD(sof/pipe-HSMICPROC-capture.m4, @@ -83,28 +83,28 @@ undefine(`PIPELINE_FILTER1') undefine(`PIPELINE_FILTER2') # Low Latency playback pipeline 4 on PCM 2 using max 2 channels of s32le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 4, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 3 using max 2 channels of s32le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 4 using max 2 channels of s32le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 ifdef(`SPKPROC_FILTER1', `define(PIPELINE_FILTER1, SPKPROC_FILTER1)', `undefine(`PIPELINE_FILTER1')') ifdef(`SPKPROC_FILTER2', `define(PIPELINE_FILTER2, SPKPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') PIPELINE_PCM_ADD(sof/pipe-SPKPROC-playback.m4, diff --git a/tools/topology/topology1/development/sof-cml-src-rt5682.m4 b/tools/topology/topology1/development/sof-cml-src-rt5682.m4 index 7f0291237d0d..1c5f91c36b92 100644 --- a/tools/topology/topology1/development/sof-cml-src-rt5682.m4 +++ b/tools/topology/topology1/development/sof-cml-src-rt5682.m4 @@ -38,42 +38,42 @@ 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 s24le. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 8000, 96000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# 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, 2, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Passthrough capture pipeline 3 on PCM 1 using max 4 channels. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 3, 1, 4, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 2 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-volume-playback.m4, 4, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 3 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-volume-playback.m4, 5, 3, 2, s32le, 1000, 0, 0, 48000 ,48000 ,48000) # Low Latency playback pipeline 6 on PCM 4 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-volume-playback.m4, 6, 4, 2, s32le, 1000, 0, 0, @@ -89,42 +89,42 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP1 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, 1, SSP1-Codec, PIPELINE_SOURCE_1, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 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, 1, SSP1-Codec, PIPELINE_SINK_2, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC01 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, 3, DMIC, 0, dmic01, PIPELINE_SINK_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 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-playback.m4, 4, HDA, 0, iDisp1, PIPELINE_SOURCE_4, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 5, HDA, 1, iDisp2, PIPELINE_SOURCE_5, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 6, HDA, 2, iDisp3, PIPELINE_SOURCE_6, 2, s32le, diff --git a/tools/topology/topology1/development/sof-hda-asrc.m4 b/tools/topology/topology1/development/sof-hda-asrc.m4 index d91fb862c3ad..40a9c60a3d16 100644 --- a/tools/topology/topology1/development/sof-hda-asrc.m4 +++ b/tools/topology/topology1/development/sof-hda-asrc.m4 @@ -50,49 +50,49 @@ include(`platform/intel/intel-generic-dmic.m4') # # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le. -# 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, s24le, 1000, 0, 0, 8000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# 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, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 1 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 3, 1, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 4, 1, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 3 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 3, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 8 on PCM 4 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 4, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 9 on PCM 5 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 9, 5, 2, s24le, 1000, 0, 0, @@ -103,49 +103,49 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, # # playback DAI is HDA Analog using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 1, HDA, 0, Analog Playback and Capture, PIPELINE_SOURCE_1, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is HDA Analog using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, HDA, 1, Analog Playback and Capture, PIPELINE_SINK_2, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is HDA Digital using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, HDA, 2, Digital Playback and Capture, PIPELINE_SOURCE_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is HDA Digital using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, HDA, 3, Digital Playback and Capture, PIPELINE_SINK_4, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 7, HDA, 4, iDisp1, PIPELINE_SOURCE_7, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 8, HDA, 5, iDisp2, PIPELINE_SOURCE_8, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 9, HDA, 6, iDisp3, PIPELINE_SOURCE_9, 2, s32le, diff --git a/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 index 2834d0ed9a57..ab3513ff1717 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 @@ -61,7 +61,7 @@ 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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-codec-adapter-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 index 05bd6f708ed0..5089e267865c 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 @@ -59,7 +59,7 @@ 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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-codec-adapter-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 b/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 index 3de6e81267cd..c22cdb6a6ad0 100644 --- a/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 +++ b/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 @@ -32,14 +32,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 s24le. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 8000, 96000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-src-volume-capture.m4, 2, 0, 2, s24le, 1000, 0, 0, diff --git a/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 index c2d578c3ff09..b9d17684f333 100644 --- a/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 @@ -32,14 +32,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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 8000, 96000, 48000) # Low Latency capture pipeline 2 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-src-volume-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 index 1951c59614e4..aab485fad1b6 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 @@ -61,7 +61,7 @@ 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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-codec-adapter-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 index 05e8708c2e39..20fe56049343 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 @@ -59,7 +59,7 @@ 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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-codec-adapter-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 index 454b3329df74..9ae070dec6cf 100644 --- a/tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 @@ -32,14 +32,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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 8000, 96000, 48000) # Low Latency capture pipeline 2 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-src-volume-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 b/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 index 6e84027cf481..c8e3cf9d8631 100644 --- a/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 +++ b/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 @@ -114,21 +114,21 @@ 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 s16le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-demux-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Volume-switch capture pipeline 2 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 1 using max 2 channels of s16le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 3, 1, 2, s16le, 1000, 0, 3, @@ -157,7 +157,7 @@ PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 48000, 48000, 48000) # Passthrough capture pipeline 9 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-passthrough-capture.m4, 9, 5, 2, s32le, 1000, 0, 0, @@ -228,7 +228,7 @@ DAI_ADD(sof/pipe-dai-capture.m4, 1000, 0, 2, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 1 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, 9, DMIC, 1, NoCodec-7, PIPELINE_SINK_9, 2, s32le, diff --git a/tools/topology/topology1/platform/intel/cml.m4 b/tools/topology/topology1/platform/intel/cml.m4 index 050c6887f39d..5b83bcaa5f4e 100644 --- a/tools/topology/topology1/platform/intel/cml.m4 +++ b/tools/topology/topology1/platform/intel/cml.m4 @@ -21,7 +21,7 @@ ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1', ` # --- ABI VERSION is 3.9 or higher case ---- # Low Latency playback pipeline 8 on PCM 6 using max 2 channels of s32le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 # pipe-src pipeline is needed for older SSP config define(`PIPE_VOLUME_PLAYBACK', `sof/pipe-volume-playback.m4') define(`SSP1_VALID_BITS', `24') @@ -44,7 +44,7 @@ define(`SET_SSP1_CONFIG_DATA', `SSP, 1, 24, 0, 0, 10')', ` # --- ABI VERSION is below 3.9 case ---- # Low Latency playback pipeline 8 on PCM 6 using max 2 channels of s32le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 # pipe-src pipeline is needed for older SSP config define(`PIPE_VOLUME_PLAYBACK', `sof/pipe-src-volume-playback.m4') define(`SSP1_VALID_BITS', `16') diff --git a/tools/topology/topology1/platform/intel/intel-generic-dmic-kwd.m4 b/tools/topology/topology1/platform/intel/intel-generic-dmic-kwd.m4 index ef7573fd97bf..c1a0512f029a 100644 --- a/tools/topology/topology1/platform/intel/intel-generic-dmic-kwd.m4 +++ b/tools/topology/topology1/platform/intel/intel-generic-dmic-kwd.m4 @@ -70,7 +70,7 @@ dnl time_domain, sched_comp) # Passthrough capture pipeline using max channels defined by CHANNELS. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 ifdef(`DMICPROC_FILTER1', `define(PIPELINE_FILTER1, DMICPROC_FILTER1)', `undefine(`PIPELINE_FILTER1')') ifdef(`DMICPROC_FILTER2', `define(PIPELINE_FILTER2, DMICPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') define(`PGA_NAME', Dmic0) @@ -89,7 +89,7 @@ undefine(`DMICPROC') # # Passthrough capture pipeline 7 on PCM 7 using max 2 channels. -# Schedule 20000us deadline with priority 0 on core 0 +# Schedule 20000us deadline on core 0 with priority 0 PIPELINE_PCM_DAI_ADD(sof/pipe-KFBM_TYPE-capture.m4, DMIC_PIPELINE_16k_ID, DMIC_PCM_16k_ID, 2, s32le, KWD_PIPE_SCH_DEADLINE_US, 0, 0, DMIC, 1, s32le, 3, @@ -107,7 +107,7 @@ 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, DMIC_PIPELINE_48k_ID, DMIC, 0, DMIC_DAI_LINK_48k_NAME, concat(`PIPELINE_SINK_', DMIC_PIPELINE_48k_ID), 2, s32le, diff --git a/tools/topology/topology1/platform/intel/intel-generic-dmic.m4 b/tools/topology/topology1/platform/intel/intel-generic-dmic.m4 index 8d06cf8ae232..01fb4a095f61 100644 --- a/tools/topology/topology1/platform/intel/intel-generic-dmic.m4 +++ b/tools/topology/topology1/platform/intel/intel-generic-dmic.m4 @@ -79,7 +79,7 @@ dnl time_domain, sched_comp) # Passthrough capture pipeline using max channels defined by DMIC_PCM_CHANNELS. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 ifdef(`DMICPROC_FILTER1', `define(PIPELINE_FILTER1, DMICPROC_FILTER1)', `undefine(`PIPELINE_FILTER1')') ifdef(`DMICPROC_FILTER2', `define(PIPELINE_FILTER2, DMICPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') define(`PGA_NAME', Dmic0) @@ -94,7 +94,7 @@ undefine(`PIPELINE_FILTER2') # Passthrough capture pipeline using max channels defined by CHANNELS. -# Schedule with 1000us deadline with priority 0 on core 0 +# Schedule with 1000us deadline on core 0 with priority 0 ifdef(`DMIC16KPROC_FILTER1', `define(PIPELINE_FILTER1, DMIC16KPROC_FILTER1)', `undefine(`PIPELINE_FILTER1')') ifdef(`DMIC16KPROC_FILTER2', `define(PIPELINE_FILTER2, DMIC16KPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') define(`PGA_NAME', Dmic1) @@ -119,7 +119,7 @@ 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, DMIC_PIPELINE_48k_ID, DMIC, 0, DMIC_DAI_LINK_48k_NAME, concat(`PIPELINE_SINK_', DMIC_PIPELINE_48k_ID), 2, s32le, diff --git a/tools/topology/topology1/sof-apl-da7219.m4 b/tools/topology/topology1/sof-apl-da7219.m4 index 9f23167d5a6c..dabfd6592a1e 100644 --- a/tools/topology/topology1/sof-apl-da7219.m4 +++ b/tools/topology/topology1/sof-apl-da7219.m4 @@ -37,35 +37,35 @@ 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-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 1 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-volume-playback.m4, 2, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 3 on PCM 1 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-volume-capture.m4, 3, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 4 on PCM 99 using max 4 channels of s32le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 4, 99, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 5 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-passthrough-playback.m4, PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 5, 2, s32le, @@ -73,7 +73,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 6 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-passthrough-playback.m4, PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 6, 2, s32le, @@ -81,7 +81,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 7 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-passthrough-playback.m4, PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 7, 2, s32le, @@ -98,49 +98,49 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP5 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-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP1 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-playback.m4, 2, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_2, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 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, SSP, 1, SSP1-Codec, PIPELINE_SINK_3, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC0 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, 4, DMIC, 0, dmic01, PIPELINE_SINK_4, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 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-playback.m4, 5, HDA, 3, iDisp1, PIPELINE_SOURCE_5, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 6, HDA, 4, iDisp2, PIPELINE_SOURCE_6, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 7, HDA, 5, iDisp3, PIPELINE_SOURCE_7, 2, s32le, diff --git a/tools/topology/topology1/sof-apl-demux-pcm512x.m4 b/tools/topology/topology1/sof-apl-demux-pcm512x.m4 index a623e936104a..dd185a137af8 100644 --- a/tools/topology/topology1/sof-apl-demux-pcm512x.m4 +++ b/tools/topology/topology1/sof-apl-demux-pcm512x.m4 @@ -70,28 +70,28 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Demux 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-volume-demux-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 1 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-volume-playback.m4, 2, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 2 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-volume-playback.m4, 3, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 3 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-volume-playback.m4, 4, 3, 2, s32le, 1000, 0, 0, @@ -107,7 +107,7 @@ 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, @@ -145,21 +145,21 @@ SectionGraph."PIPE_CAP_VIRT" { } # playback DAI is iDisp1 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-playback.m4, 2, HDA, 0, iDisp1, PIPELINE_SOURCE_2, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 3, HDA, 1, iDisp2, PIPELINE_SOURCE_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 4, HDA, 2, iDisp3, PIPELINE_SOURCE_4, 2, s32le, diff --git a/tools/topology/topology1/sof-apl-keyword-detect.m4 b/tools/topology/topology1/sof-apl-keyword-detect.m4 index 7e4a7015f781..17089fcd8627 100644 --- a/tools/topology/topology1/sof-apl-keyword-detect.m4 +++ b/tools/topology/topology1/sof-apl-keyword-detect.m4 @@ -36,7 +36,7 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Passthrough capture pipeline 1 on PCM 0 using max 2 channels. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-kfbm-capture.m4, 1, 0, 2, s16le, KWD_PIPE_SCH_DEADLINE_US, 0, 0, diff --git a/tools/topology/topology1/sof-apl-pcm512x.m4 b/tools/topology/topology1/sof-apl-pcm512x.m4 index baef388b0a11..931a7afbe029 100644 --- a/tools/topology/topology1/sof-apl-pcm512x.m4 +++ b/tools/topology/topology1/sof-apl-pcm512x.m4 @@ -51,35 +51,35 @@ 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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, FSYNC, FSYNC, FSYNC) # 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-volume-capture.m4, 6, 0, 2, s32le, 1000, 0, 0, FSYNC, FSYNC, FSYNC) # Low Latency playback pipeline 2 on PCM 5 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-volume-playback.m4, 2, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 6 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-volume-playback.m4, 3, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 7 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-volume-playback.m4, 4, 7, 2, s32le, 1000, 0, 0, @@ -110,21 +110,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, SSP_SCHEDULE_TIME_DOMAIN) # capture DAI is SSP5 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, 6, SSP, 5, SSP5-Codec, PIPELINE_SINK_6, 2, s24le, 1000, 0, 0, SSP_SCHEDULE_TIME_DOMAIN) # Media playback pipeline 5 on PCM 4 using max 2 channels of s16le. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 5, 4, 2, s16le, 1000, 0, 0, @@ -142,21 +142,21 @@ SectionGraph."media-pipeline" { } # playback DAI is iDisp1 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-playback.m4, 2, HDA, 0, iDisp1, PIPELINE_SOURCE_2, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 3, HDA, 1, iDisp2, PIPELINE_SOURCE_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 4, HDA, 2, iDisp3, PIPELINE_SOURCE_4, 2, s32le, diff --git a/tools/topology/topology1/sof-apl-rt298.m4 b/tools/topology/topology1/sof-apl-rt298.m4 index 4e1a596b8d90..3027a828df85 100644 --- a/tools/topology/topology1/sof-apl-rt298.m4 +++ b/tools/topology/topology1/sof-apl-rt298.m4 @@ -34,28 +34,28 @@ 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-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 5 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 5, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 6 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 6, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 7 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 7, 2, s16le, 1000, 0, 0, @@ -70,28 +70,28 @@ 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) # playback DAI is iDisp1 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-playback.m4, 5, HDA, 3, iDisp1, PIPELINE_SOURCE_5, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 6, HDA, 4, iDisp2, PIPELINE_SOURCE_6, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 7, HDA, 5, iDisp3, PIPELINE_SOURCE_7, 2, s32le, diff --git a/tools/topology/topology1/sof-apl-tdf8532.m4 b/tools/topology/topology1/sof-apl-tdf8532.m4 index 99447c67efc0..6711ae86e940 100644 --- a/tools/topology/topology1/sof-apl-tdf8532.m4 +++ b/tools/topology/topology1/sof-apl-tdf8532.m4 @@ -35,70 +35,70 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Low Latency playback pipeline 1 on PCM 0 using max 4 channels of s32le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 4, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 1 using max 8 channels of s32le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 2, 1, 8, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 3 on PCM 1 using max 8 channels of s32le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 3, 1, 8, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 2 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 4, 2, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 5 on PCM 2 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 5, 2, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 6 on PCM 3 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 6, 3, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 4 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 4, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 8 on PCM 4 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 8, 4, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 9 on PCM 5 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 9, 5, 2, s16le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 10 on PCM 5 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 10, 5, 2, s16le, 1000, 0, 0, @@ -115,70 +115,70 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP0 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-playback.m4, 4, SSP, 0, SSP0-Codec, PIPELINE_SOURCE_4, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP0 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, 5, SSP, 0, SSP0-Codec, PIPELINE_SINK_5, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 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, 6, SSP, 1, SSP1-Codec, PIPELINE_SINK_6, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP2 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-playback.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_2, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 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, 3, SSP, 2, SSP2-Codec, PIPELINE_SINK_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP3 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-playback.m4, 7, SSP, 3, SSP3-Codec, PIPELINE_SOURCE_7, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP3 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, 8, SSP, 3, SSP3-Codec, PIPELINE_SINK_8, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP4 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-playback.m4, 1, SSP, 4, SSP4-Codec, PIPELINE_SOURCE_1, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP5 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-playback.m4, 9, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_9, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP5 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, 10, SSP, 5, SSP5-Codec, PIPELINE_SINK_10, 2, s16le, diff --git a/tools/topology/topology1/sof-apl-wm8804.m4 b/tools/topology/topology1/sof-apl-wm8804.m4 index 5ae7cf6b6454..9543ca5b54c4 100644 --- a/tools/topology/topology1/sof-apl-wm8804.m4 +++ b/tools/topology/topology1/sof-apl-wm8804.m4 @@ -30,14 +30,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-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 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-low-latency-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, @@ -53,14 +53,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_DMA) # 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, diff --git a/tools/topology/topology1/sof-bdw-codec.m4 b/tools/topology/topology1/sof-bdw-codec.m4 index c014cce7f3df..18ce2fff9838 100644 --- a/tools/topology/topology1/sof-bdw-codec.m4 +++ b/tools/topology/topology1/sof-bdw-codec.m4 @@ -38,7 +38,7 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 48000, 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-low-latency-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, @@ -51,14 +51,14 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, # # playback DAI is SSP0 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, 0, Codec, PIPELINE_SOURCE_1, 2, s24le, 1000, 1, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. -# 2000us deadline with priority 0 on core 0 +# 2000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 1, 2, s32le, 2000, 0, 0, @@ -77,7 +77,7 @@ SectionGraph."PIPE_NAME" { } # capture DAI is SSP0 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, 0, Codec, PIPELINE_SINK_2, 2, s24le, diff --git a/tools/topology/topology1/sof-bdw-nocodec.m4 b/tools/topology/topology1/sof-bdw-nocodec.m4 index 84dbe14a8de0..236f53cc4026 100644 --- a/tools/topology/topology1/sof-bdw-nocodec.m4 +++ b/tools/topology/topology1/sof-bdw-nocodec.m4 @@ -28,14 +28,14 @@ include(`platform/intel/bdw.m4') # # 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-low-latency-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Volume switch 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-volume-switch-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, @@ -48,7 +48,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, # # playback DAI is SSP0 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, 0, NoCodec-0, PIPELINE_SOURCE_1, 2, s24le, @@ -73,7 +73,7 @@ SectionGraph."media-pipe" { } # capture DAI is SSP0 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, 0, NoCodec-0, PIPELINE_SINK_2, 2, s24le, diff --git a/tools/topology/topology1/sof-byt-codec.m4 b/tools/topology/topology1/sof-byt-codec.m4 index 510a174e031a..1762e7e46150 100644 --- a/tools/topology/topology1/sof-byt-codec.m4 +++ b/tools/topology/topology1/sof-byt-codec.m4 @@ -25,7 +25,7 @@ include(`platform/intel/'PLATFORM`.m4') # # 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-low-latency-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, @@ -48,7 +48,7 @@ DAI_ADD(sof/pipe-mixer-dai-playback.m4, 2, 48000) # PCM Playback pipeline 3 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 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 3, 0, 2, s32le, @@ -58,7 +58,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, PIPELINE_PLAYBACK_SCHED_COMP_1) # PCM Playback pipeline 4 on PCM 1 using max 2 channels of s32le. -# 10ms deadline with priority 0 on core 0 +# 10ms deadline on core 0 with priority 0 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 4, 1, 2, s32le, @@ -81,7 +81,7 @@ SectionGraph."PIPE_NAME" { } # capture DAI is SSP2 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 # this is part of pipeline 2 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, SSP_NUM, SSP2-Codec, diff --git a/tools/topology/topology1/sof-cavs-nocodec.m4 b/tools/topology/topology1/sof-cavs-nocodec.m4 index 30ea92b208e5..0033d6174267 100644 --- a/tools/topology/topology1/sof-cavs-nocodec.m4 +++ b/tools/topology/topology1/sof-cavs-nocodec.m4 @@ -120,7 +120,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 48000, 48000, 48000) # Volume switch capture pipeline 6 on PCM 2 using max 2 channels of PIPE_BITS. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 6, 2, 2, PIPE_BITS, 1000, 0, SSP2_CORE_ID, @@ -136,7 +136,7 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP0 using 2 periods -# Buffers use DAI_BITS format, 1000us deadline with priority 0 on core 0 +# Buffers use DAI_BITS format, 1000us deadline on core 0 with priority 0 # The 'NOT_USED_IGNORED' is due to dependencies and is adjusted later with an explicit dapm line. DAI_ADD(sof/pipe-mixer-dai-playback.m4, 1, SSP, SSP0_IDX, NoCodec-0, @@ -164,14 +164,14 @@ ifelse(PLATFORM, `bxt', `', PIPELINE_PLAYBACK_SCHED_COMP_1)') # capture DAI is SSP0 using 2 periods -# Buffers use DAI_BITS format, 1000us deadline with priority 0 on core 0 +# Buffers use DAI_BITS format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, SSP0_IDX, NoCodec-0, PIPELINE_SINK_2, 2, DAI_BITS, 1000, 0, SSP0_CORE_ID, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP1 using 2 periods -# Buffers use DAI_BITS format, 1000us deadline with priority 0 on core 0 +# Buffers use DAI_BITS format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-mixer-dai-playback.m4, 3, SSP, SSP1_IDX, NoCodec-1, NOT_USED_IGNORED, 2, DAI_BITS, @@ -187,14 +187,14 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, PIPELINE_PLAYBACK_SCHED_COMP_3) # capture DAI is SSP1 using 2 periods -# Buffers use DAI_BITS format, 1000us deadline with priority 0 on core 0 +# Buffers use DAI_BITS format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, SSP, SSP1_IDX, NoCodec-1, PIPELINE_SINK_4, 2, DAI_BITS, 1000, 0, SSP1_CORE_ID, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP2 using 2 periods -# Buffers use DAI_BITS format, 1000us deadline with priority 0 on core 0 +# Buffers use DAI_BITS format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-mixer-dai-playback.m4, 5, SSP, SSP2_IDX, NoCodec-2, NOT_USED_IGNORED, 2, DAI_BITS, @@ -221,7 +221,7 @@ ifelse(PLATFORM, `bxt', PIPELINE_PLAYBACK_SCHED_COMP_5)') # capture DAI is SSP2 using 2 periods -# Buffers use DAI_BITS format, 1000us deadline with priority 0 on core 0 +# Buffers use DAI_BITS format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 6, SSP, SSP2_IDX, NoCodec-2, PIPELINE_SINK_6, 2, DAI_BITS, diff --git a/tools/topology/topology1/sof-cht-max98090.m4 b/tools/topology/topology1/sof-cht-max98090.m4 index 8ea58b0101c3..e083aa451b9d 100644 --- a/tools/topology/topology1/sof-cht-max98090.m4 +++ b/tools/topology/topology1/sof-cht-max98090.m4 @@ -25,7 +25,7 @@ include(`platform/intel/'PLATFORM`.m4') # # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 0, 2, s16le, 1000, 0, 0, @@ -48,7 +48,7 @@ DAI_ADD(sof/pipe-mixer-dai-playback.m4, 2, 48000) # PCM Playback pipeline 3 on PCM 0 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 3, 0, 2, s16le, @@ -58,7 +58,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, PIPELINE_PLAYBACK_SCHED_COMP_1) # PCM Playback pipeline 4 on PCM 1 using max 2 channels of s16le. -# 10ms deadline with priority 0 on core 0 +# 10ms deadline on core 0 with priority 0 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 4, 1, 2, s16le, @@ -81,7 +81,7 @@ SectionGraph."PIPE_NAME" { } # capture DAI is SSP2 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 # this is part of pipeline 2 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, SSP_NUM, SSP2-Codec, diff --git a/tools/topology/topology1/sof-cht-nocodec.m4 b/tools/topology/topology1/sof-cht-nocodec.m4 index 3f92ff8acf5b..cfc754f78763 100644 --- a/tools/topology/topology1/sof-cht-nocodec.m4 +++ b/tools/topology/topology1/sof-cht-nocodec.m4 @@ -25,7 +25,7 @@ include(`platform/intel/'PLATFORM`.m4') # # Volume switch 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-volume-switch-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, @@ -48,7 +48,7 @@ DAI_ADD(sof/pipe-mixer-dai-playback.m4, 2, 48000) # PCM Playback pipeline 3 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 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 3, 0, 2, s32le, @@ -58,7 +58,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, PIPELINE_PLAYBACK_SCHED_COMP_1) # PCM Playback pipeline 4 on PCM 1 using max 2 channels of s32le. -# 10ms deadline with priority 0 on core 0 +# 10ms deadline on core 0 with priority 0 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 4, 1, 2, s32le, @@ -81,7 +81,7 @@ SectionGraph."PIPE_NAME" { } # capture DAI is SSP2 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 # this is part of pipeline 2 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, SSP_NUM, NoCodec-2, diff --git a/tools/topology/topology1/sof-cml-demux-rt5682.m4 b/tools/topology/topology1/sof-cml-demux-rt5682.m4 index 05fed76c990c..9fe1e4009725 100644 --- a/tools/topology/topology1/sof-cml-demux-rt5682.m4 +++ b/tools/topology/topology1/sof-cml-demux-rt5682.m4 @@ -70,42 +70,42 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Demux pipeline 1 on PCM 0 using max 2 channels of s24le. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-demux-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# 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, 2, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Passthrough capture pipeline 3 on PCM 1 using max 4 channels. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 3, 1, 4, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 2 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-volume-playback.m4, 4, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 3 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-volume-playback.m4, 7, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 4 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-volume-playback.m4, 6, 4, 2, s32le, 1000, 0, 0, @@ -121,14 +121,14 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP(SPP_INDEX) 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, SSP_INDEX, SSP_NAME, PIPELINE_SOURCE_1, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP(SSP_INDEX) 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,SSP_INDEX, SSP_NAME, PIPELINE_SINK_2, 2, s24le, @@ -162,28 +162,28 @@ SectionGraph."PIPE_CAP_VIRT" { } # capture DAI is DMIC01 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, 3, DMIC, 0, dmic01, PIPELINE_SINK_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 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-playback.m4, 4, HDA, 0, iDisp1, PIPELINE_SOURCE_4, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 7, HDA, 1, iDisp2, PIPELINE_SOURCE_7, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 6, HDA, 2, iDisp3, PIPELINE_SOURCE_6, 2, s32le, diff --git a/tools/topology/topology1/sof-cml-rt1011-rt5682.m4 b/tools/topology/topology1/sof-cml-rt1011-rt5682.m4 index 20a69697da30..845bfa06d9a3 100644 --- a/tools/topology/topology1/sof-cml-rt1011-rt5682.m4 +++ b/tools/topology/topology1/sof-cml-rt1011-rt5682.m4 @@ -31,7 +31,7 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Low Latency playback pipeline 7 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(PIPE_PROC_PLAYBACK, 7, 5, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-cml-rt5682-kwd.m4 b/tools/topology/topology1/sof-cml-rt5682-kwd.m4 index d02ba0285ab1..67ae8f07defe 100644 --- a/tools/topology/topology1/sof-cml-rt5682-kwd.m4 +++ b/tools/topology/topology1/sof-cml-rt5682-kwd.m4 @@ -52,21 +52,21 @@ 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 s24le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # DMICPROC capture pipeline 3 on PCM 1 using max 4 channels. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 ifdef(`DMICPROC_FILTER1', `define(PIPELINE_FILTER1, DMICPROC_FILTER1)') ifdef(`DMICPROC_FILTER2', `define(PIPELINE_FILTER2, DMICPROC_FILTER2)') @@ -79,21 +79,21 @@ undefine(`PIPELINE_FILTER1') undefine(`PIPELINE_FILTER2') # Low Latency playback pipeline 4 on PCM 2 using max 2 channels of s32le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 4, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 3 using max 2 channels of s32le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 4 using max 2 channels of s32le. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 4, 2, s32le, 1000, 0, 0, @@ -155,7 +155,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # # Passthrough capture pipeline 7 on PCM 7 using max 2 channels. -# Schedule 20000us deadline with priority 0 on core 0 +# Schedule 20000us deadline on core 0 with priority 0 PIPELINE_PCM_DAI_ADD(sof/pipe-kfbm-capture.m4, 8, 8, 2, s24le, KWD_PIPE_SCH_DEADLINE_US, 0, 0, DMIC, 1, s32le, 3, diff --git a/tools/topology/topology1/sof-cml-rt5682.m4 b/tools/topology/topology1/sof-cml-rt5682.m4 index ac928383ea08..0a3a7d5612f5 100644 --- a/tools/topology/topology1/sof-cml-rt5682.m4 +++ b/tools/topology/topology1/sof-cml-rt5682.m4 @@ -45,21 +45,21 @@ 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 s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-`HSEARPROC'-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-`HSMICPROC'-capture.m4, 2, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Passthrough capture pipeline 3 on PCM 1 using max 4 channels. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 ifdef(`DMICPROC_FILTER1', `define(PIPELINE_FILTER1, DMICPROC_FILTER1)', `undefine(`PIPELINE_FILTER1')') ifdef(`DMICPROC_FILTER2', `define(PIPELINE_FILTER2, DMICPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') define(`PGA_NAME', Dmic0) @@ -74,28 +74,28 @@ undefine(`PIPELINE_FILTER1') undefine(`PIPELINE_FILTER2') # Low Latency playback pipeline 4 on PCM 2 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-volume-playback.m4, 4, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 3 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-volume-playback.m4, 5, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 4 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-volume-playback.m4, 6, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Passthrough capture pipeline 7 on PCM 5 using max 2 channels. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 ifdef(`DMIC16KPROC_FILTER1', `define(PIPELINE_FILTER1, DMIC16KPROC_FILTER1)', `undefine(`PIPELINE_FILTER1')') ifdef(`DMIC16KPROC_FILTER2', `define(PIPELINE_FILTER2, DMIC16KPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') define(`PGA_NAME', Dmic1) @@ -119,42 +119,42 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP(SPP_INDEX) 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, SSP_INDEX, SSP_NAME, PIPELINE_SOURCE_1, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP(SSP_INDEX) 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,SSP_INDEX, SSP_NAME, PIPELINE_SINK_2, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC01 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, 3, DMIC, 0, dmic01, PIPELINE_SINK_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 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-playback.m4, 4, HDA, 0, iDisp1, PIPELINE_SOURCE_4, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 5, HDA, 1, iDisp2, PIPELINE_SOURCE_5, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 6, HDA, 2, iDisp3, PIPELINE_SOURCE_6, 2, s32le, diff --git a/tools/topology/topology1/sof-cml-rt700.m4 b/tools/topology/topology1/sof-cml-rt700.m4 index ef2ac9ae23e6..68fc6495986d 100644 --- a/tools/topology/topology1/sof-cml-rt700.m4 +++ b/tools/topology/topology1/sof-cml-rt700.m4 @@ -61,35 +61,35 @@ 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. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 1, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 6 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 8 on PCM 7 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 7, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-cnl-rt274.m4 b/tools/topology/topology1/sof-cnl-rt274.m4 index 6ea8cb35dd27..3b9b25da7934 100644 --- a/tools/topology/topology1/sof-cnl-rt274.m4 +++ b/tools/topology/topology1/sof-cnl-rt274.m4 @@ -31,14 +31,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 s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 0, 2, s24le, 1000, 0, 0, @@ -56,14 +56,14 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP0 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, 0, SSP0-Codec, PIPELINE_SOURCE_1, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP0 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, 0, SSP0-Codec, PIPELINE_SINK_2, 2, s24le, diff --git a/tools/topology/topology1/sof-cnl-rt5682-sdw2.m4 b/tools/topology/topology1/sof-cnl-rt5682-sdw2.m4 index 8d520fbffb1d..8c4651b89bcf 100644 --- a/tools/topology/topology1/sof-cnl-rt5682-sdw2.m4 +++ b/tools/topology/topology1/sof-cnl-rt5682-sdw2.m4 @@ -36,35 +36,35 @@ 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. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 2, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 3, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 3 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 4, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 4 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 7, 2, s32le, 1000, 0, 0, @@ -94,21 +94,21 @@ DAI_ADD(sof/pipe-dai-capture.m4, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 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-playback.m4, 3, HDA, 0, iDisp1, PIPELINE_SOURCE_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 4, HDA, 1, iDisp2, PIPELINE_SOURCE_4, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 5, HDA, 2, iDisp3, PIPELINE_SOURCE_5, 2, s32le, diff --git a/tools/topology/topology1/sof-ehl-rt5660.m4 b/tools/topology/topology1/sof-ehl-rt5660.m4 index 132740bbb10f..e9667627b34d 100644 --- a/tools/topology/topology1/sof-ehl-rt5660.m4 +++ b/tools/topology/topology1/sof-ehl-rt5660.m4 @@ -44,28 +44,28 @@ dnl time_domain, sched_comp) # which is not applicable in ehl-rt5660. # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 3 on PCM 1 using max 4 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 3, 1, 4, s32le, 1000, 0, 0, 48000, 48000, 48000) # Passthrough capture pipeline 4 on PCM 3 using max 2 channels. -# Schedule 16 frames per 1000us deadline with priority 0 on core 0 +# Schedule 16 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 4, 3, 2, s16le, 1000, 0, 0, @@ -74,28 +74,28 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, ifelse(HDMI, `1', ` # Low Latency playback pipeline 4 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 3 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 4 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 5, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-glk-da7219-kwd.m4 b/tools/topology/topology1/sof-glk-da7219-kwd.m4 index 5482f68335a1..373ec6cfc897 100644 --- a/tools/topology/topology1/sof-glk-da7219-kwd.m4 +++ b/tools/topology/topology1/sof-glk-da7219-kwd.m4 @@ -51,28 +51,28 @@ 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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(PIPE_VOLUME_PLAYBACK, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 1 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-volume-playback.m4, 2, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 3 on PCM 1 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-volume-capture.m4, 3, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 4 on PCM 99 using max 4 channels of s32le. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(DMIC_PIPE_CAPTURE, 4, DMIC_PCM_NUM, 4, DMIC01_FMT, @@ -80,21 +80,21 @@ PIPELINE_PCM_ADD(DMIC_PIPE_CAPTURE, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 5 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-volume-playback.m4, 5, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 6 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-volume-playback.m4, 6, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 7 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-volume-playback.m4, 7, 7, 2, s32le, 1000, 0, 0, @@ -117,7 +117,7 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP1 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-playback.m4, 1, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_1, 2, SSP1_VALID_BITS_STR, @@ -132,42 +132,42 @@ DAI_ADD(sof/pipe-dai-capture.m4, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)') # playback DAI is SSP(SSP_INDEX) 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-playback.m4, 2, SSP, SSP_INDEX, SSP_NAME, PIPELINE_SOURCE_2, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP(SSP_INDEX) 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, SSP, SSP_INDEX, SSP_NAME, PIPELINE_SINK_3, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC0 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, 4, DMIC, 0, dmic01, PIPELINE_SINK_4, 2, DMIC01_FMT, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 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-playback.m4, 5, HDA, HDMI0_INDEX, iDisp1, PIPELINE_SOURCE_5, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 6, HDA, HDMI1_INDEX, iDisp2, PIPELINE_SOURCE_6, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 7, HDA, HDMI2_INDEX, iDisp3, PIPELINE_SOURCE_7, 2, s32le, @@ -178,7 +178,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # # Passthrough capture pipeline 8 on PCM 8 using max 2 channels. -# Schedule 20000us deadline with priority 0 on core 0 +# Schedule 20000us deadline on core 0 with priority 0 PIPELINE_PCM_DAI_ADD(sof/pipe-kfbm-capture.m4, 8, 8, 2, DMIC1_FMT, KWD_PIPE_SCH_DEADLINE_US, 0, 0, DMIC, 1, DMIC01_FMT, 3, diff --git a/tools/topology/topology1/sof-glk-da7219.m4 b/tools/topology/topology1/sof-glk-da7219.m4 index c92982355101..61be17c92928 100644 --- a/tools/topology/topology1/sof-glk-da7219.m4 +++ b/tools/topology/topology1/sof-glk-da7219.m4 @@ -38,21 +38,21 @@ 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-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 1 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-volume-playback.m4, 2, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 3 on PCM 1 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-volume-capture.m4, 3, 1, 2, s32le, 1000, 0, 0, @@ -63,14 +63,14 @@ ifdef(`DMICPROC', , `define(DMICPROC, volume)') define(DEF_PIPE_DMIC_CAPTURE, sof/pipe-DMICPROC-capture.m4) # Low Latency capture pipeline 4 on PCM 99 using max 4 channels of s32le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(DEF_PIPE_DMIC_CAPTURE, 4, 99, 4, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 5 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-passthrough-playback.m4, PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 5, 2, s32le, @@ -78,7 +78,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 6 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-passthrough-playback.m4, PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 6, 2, s32le, @@ -86,7 +86,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 7 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-passthrough-playback.m4, PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 7, 2, s32le, @@ -103,7 +103,7 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP1 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-playback.m4, 1, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_1, 2, s16le, @@ -111,28 +111,28 @@ DAI_ADD(sof/pipe-dai-playback.m4, ifelse(HEADPHONE, `da7219', ` # playback DAI is SSP2 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-playback.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_2, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 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, SSP, 2, SSP2-Codec, PIPELINE_SINK_3, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) ', HEADPHONE, `cs42l42', ` # playback DAI is SSP2 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, 2, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_2, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 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, 3, SSP, 2, SSP2-Codec, PIPELINE_SINK_3, 2, s24le, @@ -140,28 +140,28 @@ DAI_ADD(sof/pipe-dai-capture.m4, ', ) # capture DAI is DMIC0 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, 4, DMIC, 0, dmic01, PIPELINE_SINK_4, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 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-playback.m4, 5, HDA, 3, iDisp1, PIPELINE_SOURCE_5, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 6, HDA, 4, iDisp2, PIPELINE_SOURCE_6, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 7, HDA, 5, iDisp3, PIPELINE_SOURCE_7, 2, s32le, diff --git a/tools/topology/topology1/sof-glk-es8336.m4 b/tools/topology/topology1/sof-glk-es8336.m4 index 072d399aab70..92889d36d3e3 100644 --- a/tools/topology/topology1/sof-glk-es8336.m4 +++ b/tools/topology/topology1/sof-glk-es8336.m4 @@ -67,35 +67,35 @@ ifelse(CHANNELS, `0', # PCM7 ----> volume (pipe 7) -----> iDisp3 (HDMI/DP playback, BE link 7) # 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-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 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-low-latency-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 5 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-volume-playback.m4, 5, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 6 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-volume-playback.m4, 6, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 7 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-volume-playback.m4, 7, 7, 2, s32le, 1000, 0, 0, @@ -111,35 +111,35 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP2 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, SSP_NUM, `SSP'SSP_NUM`-Codec', PIPELINE_SOURCE_1, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # capture DAI is SSP2 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, SSP_NUM, `SSP'SSP_NUM`-Codec', PIPELINE_SINK_2, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # playback DAI is iDisp1 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-playback.m4, 5, HDA, 3, iDisp1, PIPELINE_SOURCE_5, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 6, HDA, 4, iDisp2, PIPELINE_SOURCE_6, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 7, HDA, 5, iDisp3, PIPELINE_SOURCE_7, 2, s32le, diff --git a/tools/topology/topology1/sof-glk-rt5682.m4 b/tools/topology/topology1/sof-glk-rt5682.m4 index a732c6f0a515..0864c74a5a6d 100644 --- a/tools/topology/topology1/sof-glk-rt5682.m4 +++ b/tools/topology/topology1/sof-glk-rt5682.m4 @@ -40,28 +40,28 @@ 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-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 1 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-volume-playback.m4, 2, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 3 on PCM 1 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-volume-capture.m4, 3, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 4 on PCM 99 using max 4 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 #PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 4, 99, 4, s16le, @@ -69,7 +69,7 @@ PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 5 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 # PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 5, 2, s16le, @@ -77,7 +77,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 6 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 # PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 6, 2, s16le, @@ -85,7 +85,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 7 using max 2 channels of s16le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 # PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 7, 2, s16le, @@ -102,49 +102,49 @@ dnl buffer, periods, format, dnl deadline, priority, core, time_domain) # playback DAI is SSP1 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-playback.m4, 1, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_1, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP1 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-playback.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_2, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 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, SSP, 2, SSP2-Codec, PIPELINE_SINK_3, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC0 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, 4, DMIC, 0, dmic01, PIPELINE_SINK_4, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 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-playback.m4, 5, HDA, 3, iDisp1, PIPELINE_SOURCE_5, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 6, HDA, 4, iDisp2, PIPELINE_SOURCE_6, 2, s16le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 7, HDA, 5, iDisp3, PIPELINE_SOURCE_7, 2, s16le, diff --git a/tools/topology/topology1/sof-hda-generic-idisp.m4 b/tools/topology/topology1/sof-hda-generic-idisp.m4 index 65cd7f6a3804..958c635efae7 100644 --- a/tools/topology/topology1/sof-hda-generic-idisp.m4 +++ b/tools/topology/topology1/sof-hda-generic-idisp.m4 @@ -52,21 +52,21 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Low Latency playback pipeline 2 on PCM 1 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-volume-playback.m4, 2, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 2 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-volume-playback.m4, 3, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 3 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-volume-playback.m4, 4, 3, 2, s32le, 1000, 0, 0, @@ -82,21 +82,21 @@ dnl buffer, periods, format, dnl deadline, priority, core) # playback DAI is iDisp1 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-playback.m4, 2, HDA, 0, iDisp1, PIPELINE_SOURCE_2, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 3, HDA, 1, iDisp2, PIPELINE_SOURCE_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 4, HDA, 2, iDisp3, PIPELINE_SOURCE_4, 2, s32le, diff --git a/tools/topology/topology1/sof-hda-generic-kwd.m4 b/tools/topology/topology1/sof-hda-generic-kwd.m4 index 284aa7a6f37d..186ab6023ba6 100644 --- a/tools/topology/topology1/sof-hda-generic-kwd.m4 +++ b/tools/topology/topology1/sof-hda-generic-kwd.m4 @@ -53,49 +53,49 @@ include(`platform/intel/intel-generic-dmic-kwd.m4') ) # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 1 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 3, 1, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 4, 1, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 3 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 3, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 8 on PCM 4 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 4, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 9 on PCM 5 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 9, 5, 2, s24le, 1000, 0, 0, @@ -106,49 +106,49 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, # # playback DAI is HDA Analog using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 1, HDA, 0, Analog Playback and Capture, PIPELINE_SOURCE_1, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is HDA Analog using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, HDA, 1, Analog Playback and Capture, PIPELINE_SINK_2, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is HDA Digital using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, HDA, 2, Digital Playback and Capture, PIPELINE_SOURCE_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is HDA Digital using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, HDA, 3, Digital Playback and Capture, PIPELINE_SINK_4, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 7, HDA, 4, iDisp1, PIPELINE_SOURCE_7, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 8, HDA, 5, iDisp2, PIPELINE_SOURCE_8, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 9, HDA, 6, iDisp3, PIPELINE_SOURCE_9, 2, s32le, diff --git a/tools/topology/topology1/sof-hda-generic.m4 b/tools/topology/topology1/sof-hda-generic.m4 index 5e8eedf6235b..23f884f5758b 100644 --- a/tools/topology/topology1/sof-hda-generic.m4 +++ b/tools/topology/topology1/sof-hda-generic.m4 @@ -58,7 +58,7 @@ ifdef(`HSPROC_FILTER1', `define(PIPELINE_FILTER1, HSPROC_FILTER1)', `undefine(`P ifdef(`HSPROC_FILTER2', `define(PIPELINE_FILTER2, HSPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(PIPE_HEADSET_PLAYBACK, 1, 0, 2, s24le, 1000, 0, 0, @@ -70,42 +70,42 @@ undefine(`PIPELINE_FILTER1') undefine(`PIPELINE_FILTER2') # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-highpass-capture.m4, 2, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 1 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 3, 1, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-highpass-capture.m4, 4, 1, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 3 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 3, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 8 on PCM 4 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 4, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 9 on PCM 5 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 9, 5, 2, s24le, 1000, 0, 0, @@ -116,49 +116,49 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, # # playback DAI is HDA Analog using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 1, HDA, 0, Analog Playback and Capture, PIPELINE_SOURCE_1, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is HDA Analog using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, HDA, 1, Analog Playback and Capture, PIPELINE_SINK_2, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is HDA Digital using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, HDA, 2, Digital Playback and Capture, PIPELINE_SOURCE_3, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is HDA Digital using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, HDA, 3, Digital Playback and Capture, PIPELINE_SINK_4, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 7, HDA, 4, iDisp1, PIPELINE_SOURCE_7, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 8, HDA, 5, iDisp2, PIPELINE_SOURCE_8, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 using 2 periods -# Dai buffers use s32le format, 1000us deadline with priority 0 on core 0 +# Dai buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 9, HDA, 6, iDisp3, PIPELINE_SOURCE_9, 2, s32le, diff --git a/tools/topology/topology1/sof-icl-dmic-4ch.m4 b/tools/topology/topology1/sof-icl-dmic-4ch.m4 index b4e3e9856f00..03dea7201f96 100644 --- a/tools/topology/topology1/sof-icl-dmic-4ch.m4 +++ b/tools/topology/topology1/sof-icl-dmic-4ch.m4 @@ -29,7 +29,7 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Passthrough capture pipeline 1 on PCM 1 using max 4 channels. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 1, 1, 4, s32le, 1000, 0, 0, @@ -46,7 +46,7 @@ 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, 1, DMIC, 0, dmic01, PIPELINE_SINK_1, 2, s32le, diff --git a/tools/topology/topology1/sof-icl-rt700.m4 b/tools/topology/topology1/sof-icl-rt700.m4 index 3f17de80891a..26c1a00a16fd 100644 --- a/tools/topology/topology1/sof-icl-rt700.m4 +++ b/tools/topology/topology1/sof-icl-rt700.m4 @@ -61,35 +61,35 @@ 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. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 1, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 6 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 8 on PCM 7 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 7, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 index 5c1dff936517..616df39d08a0 100644 --- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -91,14 +91,14 @@ dnl time_domain, sched_comp) ifdef(`NOJACK', `', ` # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 2, 1, 2, s32le, 1000, 0, 0, @@ -108,7 +108,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, ifdef(`MONO', ` # Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 3, 2, 2, s32le, 1000, 0, 0, @@ -116,7 +116,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, ', ` # Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION',`sof/pipe-volume-playback.m4', `sof/pipe-volume-demux-playback.m4'), 3, 2, 2, s32le, @@ -124,7 +124,7 @@ PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION',`sof/pipe-volume-playback.m4', 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 40 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION', `sof/pipe-volume-playback.m4', `sof/pipe-dai-endpoint.m4'), 4, 40, 2, s32le, @@ -133,28 +133,28 @@ PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION', `sof/pipe-volume-playback.m4', ') # Low Latency capture pipeline 5 on PCM 4 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-highpass-switch-capture.m4, 5, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 6 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 8 on PCM 7 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 7, 2, s32le, 1000, 0, 0, @@ -226,21 +226,21 @@ DAI_ADD(sof/pipe-dai-capture.m4, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 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-playback.m4, 6, HDA, 0, iDisp1, PIPELINE_SOURCE_6, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 7, HDA, 1, iDisp2, PIPELINE_SOURCE_7, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 8, HDA, 2, iDisp3, PIPELINE_SOURCE_8, 2, s32le, diff --git a/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 b/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 index fc9e3360a165..2f9d257a4923 100644 --- a/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 @@ -27,7 +27,7 @@ include(`platform/imx/imx8.m4') # # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 0, 2, s24le, 1000, 0, 0, @@ -50,7 +50,7 @@ DAI_ADD(sof/pipe-mixer-dai-playback.m4, 2, 48000) # PCM Playback pipeline 3 on PCM 0 using max 2 channels of s24le. -# 1000us deadline with priority 0 on core 0 +# 1000us deadline on core 0 with priority 0 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 3, 0, 2, s24le, @@ -60,7 +60,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, PIPELINE_PLAYBACK_SCHED_COMP_1) # PCM Playback pipeline 4 on PCM 1 using max 2 channels of s24le. -# 5ms deadline with priority 0 on core 0 +# 5ms deadline on core 0 with priority 0 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 4, 1, 2, s24le, @@ -83,7 +83,7 @@ SectionGraph."PIPE_NAME" { } # capture DAI is ESAI0 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 # this is part of pipeline 2 DAI_ADD(sof/pipe-dai-capture.m4, 2, ESAI, 0, esai0-cs42888, diff --git a/tools/topology/topology1/sof-imx8-cs42888.m4 b/tools/topology/topology1/sof-imx8-cs42888.m4 index b7e00b57007e..770337f34f96 100644 --- a/tools/topology/topology1/sof-imx8-cs42888.m4 +++ b/tools/topology/topology1/sof-imx8-cs42888.m4 @@ -32,14 +32,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 s24le. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. -# 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, 2, 0, 2, s24le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-imx8-nocodec-sai.m4 b/tools/topology/topology1/sof-imx8-nocodec-sai.m4 index 4c130f075146..e1337d80c8b2 100644 --- a/tools/topology/topology1/sof-imx8-nocodec-sai.m4 +++ b/tools/topology/topology1/sof-imx8-nocodec-sai.m4 @@ -32,7 +32,7 @@ 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 s24le -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-imx8-nocodec.m4 b/tools/topology/topology1/sof-imx8-nocodec.m4 index dadd916c7599..36567907216b 100644 --- a/tools/topology/topology1/sof-imx8-nocodec.m4 +++ b/tools/topology/topology1/sof-imx8-nocodec.m4 @@ -32,7 +32,7 @@ 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 s24le -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s24le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 b/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 index 2a7da50c1a86..0ccbc32ced6e 100644 --- a/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 @@ -34,7 +34,7 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Passthrough capture pipeline 1 on PCM 0 using max 2 channels. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-kfbm-no-lp-capture.m4, 1, 0, 2, s32le, KWD_PIPE_SCH_DEADLINE_US, 0, 0, diff --git a/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 index fc8dbb41115d..139f6c70877d 100644 --- a/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 @@ -27,7 +27,7 @@ include(`platform/imx/imx8.m4') # # 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-low-latency-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, @@ -50,7 +50,7 @@ DAI_ADD(sof/pipe-mixer-dai-playback.m4, 2, 48000) # PCM Playback pipeline 3 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 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 3, 0, 2, s32le, @@ -60,7 +60,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, PIPELINE_PLAYBACK_SCHED_COMP_1) # PCM Playback pipeline 4 on PCM 1 using max 2 channels of s32le. -# 5ms deadline with priority 0 on core 0 +# 5ms deadline on core 0 with priority 0 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 4, 1, 2, s32le, @@ -83,7 +83,7 @@ SectionGraph."PIPE_NAME" { } # capture DAI is SAI1 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 # this is part of pipeline 2 DAI_ADD(sof/pipe-dai-capture.m4, 2, SAI, 1, sai1-wm8960-hifi, diff --git a/tools/topology/topology1/sof-imx8-wm8960.m4 b/tools/topology/topology1/sof-imx8-wm8960.m4 index 65659bac4afd..7a757f20127b 100644 --- a/tools/topology/topology1/sof-imx8-wm8960.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960.m4 @@ -32,14 +32,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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-`PPROC'-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 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-volume-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 b/tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 index 18d08b3e31fa..21f46c530b2c 100644 --- a/tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 +++ b/tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 @@ -34,7 +34,7 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Passthrough capture pipeline 1 on PCM 0 using max 2 channels. -# Schedule 1000us deadline with priority 0 on core 0 +# Schedule 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-kfbm-no-lp-capture.m4, 1, 0, 2, s16le, KWD_PIPE_SCH_DEADLINE_US, 0, 0, diff --git a/tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 index 488a2cb1fc21..ca3a0d3e9562 100644 --- a/tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 @@ -27,7 +27,7 @@ include(`platform/imx/imx8.m4') # # 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-low-latency-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, @@ -50,7 +50,7 @@ DAI_ADD(sof/pipe-mixer-dai-playback.m4, 2, 48000) # PCM Playback pipeline 3 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 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 3, 0, 2, s32le, @@ -60,7 +60,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, PIPELINE_PLAYBACK_SCHED_COMP_1) # PCM Playback pipeline 4 on PCM 1 using max 2 channels of s32le. -# 5ms deadline with priority 0 on core 0 +# 5ms deadline on core 0 with priority 0 # this is connected to pipeline DAI 1 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 4, 1, 2, s32le, @@ -83,7 +83,7 @@ SectionGraph."PIPE_NAME" { } # capture DAI is SAI3 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 # this is part of pipeline 2 DAI_ADD(sof/pipe-dai-capture.m4, 2, SAI, 3, sai3-wm8960-hifi, diff --git a/tools/topology/topology1/sof-imx8mp-wm8960.m4 b/tools/topology/topology1/sof-imx8mp-wm8960.m4 index 9acc5baf34ff..972dd0d56cbc 100644 --- a/tools/topology/topology1/sof-imx8mp-wm8960.m4 +++ b/tools/topology/topology1/sof-imx8mp-wm8960.m4 @@ -32,14 +32,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. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-`PPROC'-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 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-volume-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-imx8ulp-btsco.m4 b/tools/topology/topology1/sof-imx8ulp-btsco.m4 index b5df92b1d392..2f6a8001eabf 100644 --- a/tools/topology/topology1/sof-imx8ulp-btsco.m4 +++ b/tools/topology/topology1/sof-imx8ulp-btsco.m4 @@ -34,7 +34,7 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Low Latency playback pipeline 1 on PCM 0 using max 1 channels of s16le. -# Set 1000us deadline with priority 0 on core 0 +# Set 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 1, s16le, 1000, 0, 0, @@ -43,7 +43,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, undefine(`CHANNELS_MIN') # Low Latency capture pipeline 2 on PCM 0 using max 1 channels of s16le. -# 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, 2, 0, 1, s16le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-jsl-da7219.m4 b/tools/topology/topology1/sof-jsl-da7219.m4 index 4ec553651165..52213bde60f8 100644 --- a/tools/topology/topology1/sof-jsl-da7219.m4 +++ b/tools/topology/topology1/sof-jsl-da7219.m4 @@ -57,14 +57,14 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Low Latency playback pipeline 1 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 1, 2, s32le, 1000, 0, 0, @@ -77,21 +77,21 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 3 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 4 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 4, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-jsl-rt5682.m4 b/tools/topology/topology1/sof-jsl-rt5682.m4 index fbc2bb89ecb4..b0e26e98552c 100644 --- a/tools/topology/topology1/sof-jsl-rt5682.m4 +++ b/tools/topology/topology1/sof-jsl-rt5682.m4 @@ -56,7 +56,7 @@ dnl pipe id, pcm, max channels, format, dnl frames, deadline, priority, core) # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 define(ENDPOINT_NAME, `Speakers') PIPELINE_PCM_ADD( ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-volume-playback.m4), @@ -66,7 +66,7 @@ PIPELINE_PCM_ADD( undefine(ENDPOINT_NAME) # Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 define(ENDPOINT_NAME, `Headphones') PIPELINE_PCM_ADD( ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, @@ -78,28 +78,28 @@ PIPELINE_PCM_ADD( undefine(ENDPOINT_NAME) # Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 3, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 3 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 4 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 4, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-mt8195-mt6359-rt1019-rt5682.m4 b/tools/topology/topology1/sof-mt8195-mt6359-rt1019-rt5682.m4 index 453b5c6bbed9..4e8dc7d4c8cd 100644 --- a/tools/topology/topology1/sof-mt8195-mt6359-rt1019-rt5682.m4 +++ b/tools/topology/topology1/sof-mt8195-mt6359-rt1019-rt5682.m4 @@ -35,28 +35,28 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Low Latency capture pipeline 1 on PCM 16 using max 2 channels of s16le -# Set 10000us deadline with priority 0 on core 0 +# Set 10000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, 1, 16, 2, s16le, 10000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 16 using max 2 channels of s16le -# Set 10000us deadline with priority 0 on core 0 +# Set 10000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, 2, 17, 2, s16le, 10000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 3 on PCM 16 using max 2 channels of s16le -# Set 10000us deadline with priority 0 on core 0 +# Set 10000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 3, 18, 2, s16le, 10000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 16 using max 2 channels of s16le -# Set 10000us deadline with priority 0 on core 0 +# Set 10000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, 4, 19, 2, s16le, 10000, 0, 0, diff --git a/tools/topology/topology1/sof-smart-amplifier.m4 b/tools/topology/topology1/sof-smart-amplifier.m4 index b96f7f163480..7948fbed435f 100644 --- a/tools/topology/topology1/sof-smart-amplifier.m4 +++ b/tools/topology/topology1/sof-smart-amplifier.m4 @@ -124,14 +124,14 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate, dnl time_domain, sched_comp) # Demux 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-smart-amplifier-playback.m4, SMART_PB_PPL_ID, SMART_PCM_ID, SMART_PB_CH_NUM, s32le, SMART_AMP_PERIOD, 0, SMART_AMP_CORE, 48000, 48000, 48000) # Low Latency capture pipeline 2 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 ifelse(SDW, `1', ` PIPELINE_PCM_ADD(sof/pipe-amp-ref-capture.m4, @@ -158,14 +158,14 @@ dnl deadline, priority, core, time_domain) ifelse(SDW, `1', ` # playback DAI is ALH(ALH_INDEX) 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-playback.m4, SMART_PB_PPL_ID, ALH, SMART_ALH_INDEX, SMART_ALH_PLAYBACK_NAME, SMART_PIPE_SOURCE, 2, s24le, SMART_AMP_PERIOD, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(ALH_INDEX) 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, SMART_REF_PPL_ID, ALH, eval(SMART_ALH_INDEX + 1), SMART_ALH_CAPTURE_NAME, SMART_PIPE_SINK, 2, s24le, @@ -173,14 +173,14 @@ DAI_ADD(sof/pipe-dai-capture.m4, ', ` # playback DAI is SSP(SPP_INDEX) 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-playback.m4, SMART_PB_PPL_ID, SSP, SMART_SSP_INDEX, SMART_SSP_NAME, SMART_PIPE_SOURCE, 2, s32le, SMART_AMP_PERIOD, 0, SMART_AMP_CORE, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP(SSP_INDEX) 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, SMART_REF_PPL_ID, SSP, SMART_SSP_INDEX, SMART_SSP_NAME, SMART_PIPE_SINK, 2, s32le, diff --git a/tools/topology/topology1/sof-tgl-max98357a-rt5682-rtnr-16kHz.m4 b/tools/topology/topology1/sof-tgl-max98357a-rt5682-rtnr-16kHz.m4 index d0a8ede2bde3..48f7ba0c3ebc 100644 --- a/tools/topology/topology1/sof-tgl-max98357a-rt5682-rtnr-16kHz.m4 +++ b/tools/topology/topology1/sof-tgl-max98357a-rt5682-rtnr-16kHz.m4 @@ -59,49 +59,49 @@ dnl pipe id, pcm, max channels, format, dnl frames, deadline, priority, core) # Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s24le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s24le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 3 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 4 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 ifdef(`SPKPROC_FILTER1', `define(PIPELINE_FILTER1, SPKPROC_FILTER1)', `undefine(`PIPELINE_FILTER1')') ifdef(`SPKPROC_FILTER2', `define(PIPELINE_FILTER2, SPKPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')') PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, diff --git a/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 b/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 index 8b48ceae547b..8fc95d47a9aa 100644 --- a/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 +++ b/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 @@ -109,7 +109,7 @@ dnl pipe id, pcm, max channels, format, dnl frames, deadline, priority, core) # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 define(`ENDPOINT_NAME', `Speakers') PIPELINE_PCM_ADD( ifdef(`WAVES', sof/pipe-waves-codec-demux-playback.m4, @@ -121,7 +121,7 @@ PIPELINE_PCM_ADD( undefine(`ENDPOINT_NAME') # Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s24le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 define(`ENDPOINT_NAME', `Headphones') PIPELINE_PCM_ADD( ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-volume-playback.m4), @@ -131,35 +131,35 @@ PIPELINE_PCM_ADD( undefine(`ENDPOINT_NAME') # Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s24le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 3, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 2 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 3 on PCM 3 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 4 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 5, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 b/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 index 809090cab006..f266aea1908e 100644 --- a/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 +++ b/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 @@ -102,7 +102,7 @@ dnl frames, deadline, priority, core) ifdef(`INCLUDE_IIR_EQ', ` # Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-eq-iir-volume-playback.m4, 2, 1, 2, s32le, 1000, 0, 0, @@ -111,7 +111,7 @@ PIPELINE_PCM_ADD(sof/pipe-eq-iir-volume-playback.m4, , ` # Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 2, 1, 2, s32le, 1000, 0, 0, @@ -120,35 +120,35 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, # Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 3, 1, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 5 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 5, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 6 on PCM 3 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 3, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 4 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 8 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 5, 2, s32le, 1000, 0, 0, diff --git a/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 b/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 index 48a1d26342aa..db9a728fcf31 100644 --- a/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 +++ b/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 @@ -118,14 +118,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. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 1, 2, s32le, 1000, 0, 0, @@ -134,35 +134,35 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, ifdef(`EXT_AMP', ` # Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 3, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) ') # Low Latency playback pipeline 6 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 6 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 8 on PCM 7 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 7, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 9 on PCM 8 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 9, 8, 2, s32le, 1000, 0, 0, @@ -202,21 +202,21 @@ DAI_ADD(sof/pipe-dai-playback.m4, ') # playback DAI is iDisp1 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-playback.m4, 6, HDA, 0, iDisp1, PIPELINE_SOURCE_6, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp2 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-playback.m4, 7, HDA, 1, iDisp2, PIPELINE_SOURCE_7, 2, s32le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp3 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-playback.m4, 8, HDA, 2, iDisp3, PIPELINE_SOURCE_8, 2, s32le, diff --git a/tools/topology/topology1/sof-tgl-sdw-max98373-rt5682.m4 b/tools/topology/topology1/sof-tgl-sdw-max98373-rt5682.m4 index 0dc461d934c9..b9afee8a41a0 100644 --- a/tools/topology/topology1/sof-tgl-sdw-max98373-rt5682.m4 +++ b/tools/topology/topology1/sof-tgl-sdw-max98373-rt5682.m4 @@ -96,14 +96,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. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 1, 2, s32le, 1000, 0, 0, @@ -131,28 +131,28 @@ include(`platform/intel/intel-generic-dmic-kwd.m4') # Low Latency playback pipeline 6 on PCM 5 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 6, 5, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 7 on PCM 6 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 7, 6, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 8 on PCM 7 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 8, 7, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 9 on PCM 8 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline with priority 0 on core 0 +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 9, 8, 2, s32le, 1000, 0, 0, From 86b5bb7a2918061269842f001913b04534637994 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 13:37:17 +0800 Subject: [PATCH 08/11] topology1: sof-icl-rt711-rt1308-rt715-hdmi: remove NO_AGGREGATION NO_AGGREGATION is never used now. Let's remove it. Signed-off-by: Pierre-Louis Bossart Signed-off-by: Libin Yang --- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 index 616df39d08a0..9281d6556f35 100644 --- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -117,16 +117,14 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, ` # Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION',`sof/pipe-volume-playback.m4', - `sof/pipe-volume-demux-playback.m4'), +PIPELINE_PCM_ADD(sof/pipe-volume-demux-playback.m4, 3, 2, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) # Low Latency playback pipeline 4 on PCM 40 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION', `sof/pipe-volume-playback.m4', - `sof/pipe-dai-endpoint.m4'), +PIPELINE_PCM_ADD(sof/pipe-dai-endpoint.m4, 4, 40, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) @@ -193,14 +191,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, PIPELINE_SOURCE_3, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) -ifdef(`NO_AGGREGATION', -`# playback DAI is ALH(SDW2 PIN2) using 2 periods -# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-dai-playback.m4, - 4, ALH, eval(AMP_2_LINK * 256 + 2), `SDW'eval(AMP_2_LINK)`-Playback', - PIPELINE_SOURCE_4, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)', -`ifdef(`MONO', `', +ifdef(`MONO', `', `DAI_ADD_SCHED(sof/pipe-dai-sched-playback.m4, 4, ALH, eval(AMP_2_LINK * 256 + 2), `SDW'eval(AMP_1_LINK)`-Playback', PIPELINE_SOURCE_4, 2, s24le, @@ -216,7 +207,7 @@ SectionGraph."PIPE_DEMUX" { dapm(PIPELINE_SOURCE_4, PIPELINE_DEMUX_3) ] } -')') +') # capture DAI is ALH(SDW3 PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 @@ -256,7 +247,6 @@ PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2) ') PCM_PLAYBACK_ADD(Speaker, 2, PIPELINE_PCM_3) -ifdef(`NO_AGGREGATION', `PCM_PLAYBACK_ADD(Speaker 2, 40, PIPELINE_PCM_4)',`') PCM_CAPTURE_ADD(Microphone, 4, PIPELINE_PCM_5) PCM_PLAYBACK_ADD(HDMI 1, 5, PIPELINE_PCM_6) PCM_PLAYBACK_ADD(HDMI 2, 6, PIPELINE_PCM_7) @@ -282,12 +272,6 @@ DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture', DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2))) -ifdef(`NO_AGGREGATION', -`#ALH SDW2 Pin2 (ID: 3) -DAI_CONFIG(ALH, eval(AMP_2_LINK * 256 + 2), 3, `SDW'eval(AMP_2_LINK)`-Playback', - ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_2_LINK * 256 + 2), 48000, 2)))', -`') - #ALH SDW3 Pin2 (ID: 4) DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2))) From a5496c63e960c09475793b6380a624295164d069 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 14:00:27 +0800 Subject: [PATCH 09/11] topology1: sof-icl-rt711-rt1308-rt715-hdmi: correct the link description The links are dynamically assigned. The descriptions should be changed correspondingly. Signed-off-by: Libin Yang --- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 index 9281d6556f35..cec859cd722c 100644 --- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -71,13 +71,13 @@ MUXDEMUX_CONFIG(demux_priv_3, 2, LIST(` ', `matrix1,', `matrix2')) # ifdef(`NOJACK', `', ` -# PCM0 ---> volume ----> ALH 2 BE dailink 0 -# PCM1 <--- volume <---- ALH 3 BE dailink 1 +# PCM0 ---> volume ----> ALH 2 BE UAJ_LINK +# PCM1 <--- volume <---- ALH 3 BE UAJ_LINK ') -# PCM2 ---> volume ----> ALH 2 BE dailink 2 +# PCM2 ---> volume ----> ALH 2 BE AMP_1_LINK ifdef(`MONO', `', -`# PCM40 ---> volume ----> ALH 2 BE dailink 3') -# PCM4 <--- volume <---- ALH 2 BE dailink 4 +`# PCM40 ---> volume ----> ALH 2 BE AMP_2_LINK') +# PCM4 <--- volume <---- ALH 2 BE MIC_LINK # PCM5 ---> volume ----> iDisp1 # PCM6 ---> volume ----> iDisp2 # PCM7 ---> volume ----> iDisp3 @@ -169,14 +169,14 @@ dnl deadline, priority, core, time_domain) ifdef(`NOJACK', `', ` -# playback DAI is ALH(SDW0 PIN2) using 2 periods +# playback DAI is ALH(UAJ_LINK PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, eval(UAJ_LINK * 256 + 2), `SDW'eval(UAJ_LINK)`-Playback', PIPELINE_SOURCE_1, 2, s24le, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) -# capture DAI is ALH(SDW0 PIN2) using 2 periods +# capture DAI is ALH(UAJ_LINK PIN3) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, ALH, eval(UAJ_LINK * 256 + 3), `SDW'eval(UAJ_LINK)`-Capture', @@ -184,7 +184,7 @@ DAI_ADD(sof/pipe-dai-capture.m4, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) ') -# playback DAI is ALH(SDW1 PIN2) using 2 periods +# playback DAI is ALH(AMP_1_LINK PIN2/AMP_2_LINK PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, ALH, eval(AMP_1_LINK * 256 + 2), `SDW'eval(AMP_1_LINK)`-Playback', @@ -209,7 +209,7 @@ SectionGraph."PIPE_DEMUX" { } ') -# capture DAI is ALH(SDW3 PIN2) using 2 periods +# capture DAI is ALH(MIC_LINK PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 5, ALH, eval(MIC_LINK * 256 + 2), `SDW'eval(MIC_LINK)`-Capture', @@ -259,20 +259,20 @@ PCM_PLAYBACK_ADD(HDMI 3, 7, PIPELINE_PCM_8) ifdef(`NOJACK', `', ` #ALH dai index = ((link_id << 8) | PDI id) -#ALH SDW0 Pin2 (ID: 0) +#ALH UAJ_LINK Pin2 (ID: 0) DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 2), 0, `SDW'eval(UAJ_LINK)`-Playback', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 2), 48000, 2))) -#ALH SDW0 Pin3 (ID: 1) +#ALH UAJ_LINK Pin3 (ID: 1) DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 3), 48000, 2))) ') -#ALH SDW1 Pin2 (ID: 2) +#ALH AMP_1_LINK Pin2 (ID: 2) DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2))) -#ALH SDW3 Pin2 (ID: 4) +#ALH MIC_LINK Pin2 (ID: 4) DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2))) From 35f2a623cfdf325b735960cfeb7dc87f4e9c49e2 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 28 Mar 2022 14:21:59 +0800 Subject: [PATCH 10/11] topology1: sof-icl-rt711-rt1308-rt715-hdmi: add NO_LOCAL_MIC & NOAMP support add sof-icl-rt711-rt1308-rt715-hdmi NO_LOCAL_MIC & NOAMP support Signed-off-by: Libin Yang --- tools/topology/topology1/CMakeLists.txt | 14 ++-- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 68 +++++++++++++++++-- 2 files changed, 68 insertions(+), 14 deletions(-) diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index 74ff1cf112cb..bc4c77474bd1 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -102,14 +102,14 @@ set(TPLGS "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1308-mono-rt715\;-DPLATFORM=tgl\;-DMONO\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DMIC_LINK=3" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt715-rt711-rt1308-mono\;-DPLATFORM=tgl\;-DMONO\;-DUAJ_LINK=1\;-DAMP_1_LINK=2\;-DMIC_LINK=0" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1308-rt715\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1316-rt714\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1316-rt714\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=3" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1308-l12-rt715-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l13-rt714-l2\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=3\;-DMIC_LINK=2" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l0\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DMIC_LINK=0" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l12-rt714-l0\;-DPLATFORM=adl\;-DNOJACK\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=0" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l3\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l13-rt714-l2\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=3\;-DEXT_AMP_REF\;-DMIC_LINK=2" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l0\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=0" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l12-rt714-l0\;-DPLATFORM=adl\;-DNOJACK\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=0" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l3\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DEXT_AMP_REF\;-DMIC_LINK=3" "sof-cnl-rt5682-sdw2\;sof-cnl-rt5682-sdw2\;-DPLATFORM=cnl" "sof-cml-rt5682\;sof-cml-rt5682\;-DPLATFORM=cml\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" "sof-cml-rt5682\;sof-whl-rt5682\;-DPLATFORM=whl\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 index cec859cd722c..6714baea0f9c 100644 --- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -31,6 +31,33 @@ ifdef(`AMP_2_LINK',`', ifdef(`MIC_LINK',`', `define(MIC_LINK, `3')') +# UAJ ID: 0, 1 +# AMP ID: 2, 3 (if EXT_AMP_REF defined) +# DMIC ID: 4 +# HDMI ID calculated based on the configuraiton +define(HDMI_BE_ID_BASE, `0') + +ifdef(`NOJACK', `', + `undefine(`HDMI_BE_ID_BASE') + define(HDMI_BE_ID_BASE, `2')' +) + +ifdef(`NOAMP', `', + `undefine(`HDMI_BE_ID_BASE') + define(HDMI_BE_ID_BASE, `3')' +) + +ifdef(`EXT_AMP_REF', + `undefine(`HDMI_BE_ID_BASE') + define(HDMI_BE_ID_BASE, `4')', + `' +) + +ifdef(`NO_LOCAL_MIC', `', + `undefine(`HDMI_BE_ID_BASE') + define(HDMI_BE_ID_BASE, `5')' +) + DEBUG_START dnl Configure demux @@ -40,6 +67,8 @@ dnl copied to corresponding output channels in all output streams. dnl I.e. row index is the input channel, 1 means it is copied to dnl corresponding output channel (column index), 0 means it is discarded. dnl There's a separate matrix for all outputs. +ifdef(`NOAMP', `', +` ifdef(`MONO', `', ` define(matrix1, `ROUTE_MATRIX(3, @@ -65,6 +94,7 @@ define(matrix2, `ROUTE_MATRIX(4, dnl name, num_streams, route_matrix list MUXDEMUX_CONFIG(demux_priv_3, 2, LIST(` ', `matrix1,', `matrix2')) ') +') # # Define the pipelines @@ -74,10 +104,14 @@ ifdef(`NOJACK', `', # PCM0 ---> volume ----> ALH 2 BE UAJ_LINK # PCM1 <--- volume <---- ALH 3 BE UAJ_LINK ') +ifdef(`NOAMP', `', +` # PCM2 ---> volume ----> ALH 2 BE AMP_1_LINK ifdef(`MONO', `', `# PCM40 ---> volume ----> ALH 2 BE AMP_2_LINK') -# PCM4 <--- volume <---- ALH 2 BE MIC_LINK +') +ifdef(`NO_LOCAL_MIC', `', +`# PCM4 <--- volume <---- ALH 2 BE MIC_LINK') # PCM5 ---> volume ----> iDisp1 # PCM6 ---> volume ----> iDisp2 # PCM7 ---> volume ----> iDisp3 @@ -105,6 +139,8 @@ PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4, 48000, 48000, 48000) ') +ifdef(`NOAMP', `', +` ifdef(`MONO', ` # Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le. @@ -129,13 +165,17 @@ PIPELINE_PCM_ADD(sof/pipe-dai-endpoint.m4, 1000, 0, 0, 48000, 48000, 48000) ') +') +ifdef(`NO_LOCAL_MIC', `', +` # Low Latency capture pipeline 5 on PCM 4 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-highpass-switch-capture.m4, 5, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000) +') # Low Latency playback pipeline 6 on PCM 5 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 @@ -184,6 +224,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) ') +ifdef(`NOAMP', `', +` # playback DAI is ALH(AMP_1_LINK PIN2/AMP_2_LINK PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, @@ -208,13 +250,17 @@ SectionGraph."PIPE_DEMUX" { ] } ') +') +ifdef(`NO_LOCAL_MIC', `', +` # capture DAI is ALH(MIC_LINK PIN2) using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 5, ALH, eval(MIC_LINK * 256 + 2), `SDW'eval(MIC_LINK)`-Capture', PIPELINE_SINK_5, 2, s24le, 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 @@ -245,9 +291,11 @@ ifdef(`NOJACK', `', PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_1) PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2) ') - +ifdef(`NOAMP', `', +` PCM_PLAYBACK_ADD(Speaker, 2, PIPELINE_PCM_3) -PCM_CAPTURE_ADD(Microphone, 4, PIPELINE_PCM_5) +') +ifdef(`NO_LOCAL_MIC', `', `PCM_CAPTURE_ADD(Microphone, 4, PIPELINE_PCM_5)') PCM_PLAYBACK_ADD(HDMI 1, 5, PIPELINE_PCM_6) PCM_PLAYBACK_ADD(HDMI 2, 6, PIPELINE_PCM_7) PCM_PLAYBACK_ADD(HDMI 3, 7, PIPELINE_PCM_8) @@ -268,20 +316,26 @@ DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 3), 48000, 2))) ') +ifdef(`NOAMP', `', +` #ALH AMP_1_LINK Pin2 (ID: 2) DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2))) +') +ifdef(`NO_LOCAL_MIC', `', +` #ALH MIC_LINK Pin2 (ID: 4) DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture', ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2))) +') -# 3 HDMI/DP outputs (ID: 5,6,7) -DAI_CONFIG(HDA, 0, 5, iDisp1, +# 3 HDMI/DP outputs (ID: from HDMI_BE_ID_BASE) +DAI_CONFIG(HDA, 0, HDMI_BE_ID_BASE, iDisp1, HDA_CONFIG(HDA_CONFIG_DATA(HDA, 0, 48000, 2))) -DAI_CONFIG(HDA, 1, 6, iDisp2, +DAI_CONFIG(HDA, 1, eval(HDMI_BE_ID_BASE + 1), iDisp2, HDA_CONFIG(HDA_CONFIG_DATA(HDA, 1, 48000, 2))) -DAI_CONFIG(HDA, 2, 7, iDisp3, +DAI_CONFIG(HDA, 2, eval(HDMI_BE_ID_BASE + 2), iDisp3, HDA_CONFIG(HDA_CONFIG_DATA(HDA, 2, 48000, 2))) DEBUG_END From 06c7cb47df84d824e23f423103c949d36c62b628 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Wed, 23 Mar 2022 16:59:43 +0800 Subject: [PATCH 11/11] topology1: CMakefile: add sof-adl-rt711-l2-rt1316-l01 Add sof-adl-rt711-l2-rt1316-l01 support. This tplg doesn't include any local MICs. Signed-off-by: Libin Yang --- tools/topology/topology1/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index bc4c77474bd1..f90b2167a401 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -110,6 +110,7 @@ set(TPLGS "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l12-rt714-l0\;-DPLATFORM=adl\;-DNOJACK\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=0" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l3\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=3" "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DEXT_AMP_REF\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DEXT_AMP_REF\;-DNO_LOCAL_MIC" "sof-cnl-rt5682-sdw2\;sof-cnl-rt5682-sdw2\;-DPLATFORM=cnl" "sof-cml-rt5682\;sof-cml-rt5682\;-DPLATFORM=cml\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" "sof-cml-rt5682\;sof-whl-rt5682\;-DPLATFORM=whl\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume"