From 2c0b416a1cee79e7947483a16dad2d2d5a64332a Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Wed, 14 Feb 2024 17:19:51 +0200 Subject: [PATCH] topology: topology1: switch all imx8 topologies to timer domain imx8 and imx8x now use timer domain with Zephyr native drivers so switch all topologies to timer domain. Signed-off-by: Laurentiu Mihalcea --- .../development/sof-imx8-compr-pcm-cap-wm8960.m4 | 2 +- .../topology1/development/sof-imx8-compr-pcm-wm8960.m4 | 2 +- .../topology1/development/sof-imx8-compr-wm8960.m4 | 2 +- .../topology1/development/sof-imx8-src-cs42888.m4 | 4 ++-- .../topology/topology1/development/sof-imx8-src-wm8960.m4 | 4 ++-- tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 | 8 ++++---- tools/topology/topology1/sof-imx8-cs42888-mixer.m4 | 8 ++++---- tools/topology/topology1/sof-imx8-cs42888.m4 | 4 ++-- tools/topology/topology1/sof-imx8-nocodec-sai.m4 | 2 +- tools/topology/topology1/sof-imx8-nocodec.m4 | 2 +- tools/topology/topology1/sof-imx8-wm8960-cs42888.m4 | 8 ++++---- tools/topology/topology1/sof-imx8-wm8960-kwd.m4 | 2 +- tools/topology/topology1/sof-imx8-wm8960-mixer.m4 | 8 ++++---- tools/topology/topology1/sof-imx8-wm8960.m4 | 4 ++-- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 index c1f5db6eb6c1..9136f44712e6 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 @@ -75,7 +75,7 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 1, SAI, 1, sai1-wm8960-hifi, PIPELINE_SINK_1, 2, s32le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 diff --git a/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 index 2aaea2434105..121d178ecbdc 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 @@ -75,7 +75,7 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SAI, 1, sai1-wm8960-hifi, PIPELINE_SOURCE_1, 2, s32le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 diff --git a/tools/topology/topology1/development/sof-imx8-compr-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-wm8960.m4 index 9c4e4d1c9701..597bb143feac 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-wm8960.m4 @@ -90,7 +90,7 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SAI, 1, DAI_BE_NAME, PIPELINE_SOURCE_1, 2, s32le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 diff --git a/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 b/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 index ddc16a80d632..f972da802a52 100644 --- a/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 +++ b/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 @@ -59,14 +59,14 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, ESAI, 0, esai0-cs42888, PIPELINE_SOURCE_1, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ESAI0 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, ESAI, 0, esai0-cs42888, PIPELINE_SINK_2, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 diff --git a/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 index e8a0f39a4939..664ed5420295 100644 --- a/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 @@ -69,14 +69,14 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SAI, SAI_INDEX, DAI_BE_NAME, PIPELINE_SOURCE_1, 2, s32le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SAI_SAI_INDEX using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SAI, SAI_INDEX, DAI_BE_NAME, PIPELINE_SINK_2, 2, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 diff --git a/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 index 2b1ad5977dcc..61e73d540c53 100644 --- a/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 @@ -78,7 +78,7 @@ define(`DAI_BE_NAME', concat(concat(`sai', SAI_INDEX), STREAM_NAME)) DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4, 1, SAI, SAI_INDEX, DAI_BE_NAME, NOT_USED_IGNORED, 2, s32le, - 1000, 1, 0, SCHEDULE_TIME_DOMAIN_DMA, + 1000, 1, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, 48000) # PCM Playback pipeline 3 on PCM 0 using max 2 channels of s32le. @@ -88,7 +88,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 3, 0, 2, s32le, 1000, 0, 0, 48000, 48000, 48000, - SCHEDULE_TIME_DOMAIN_DMA, + SCHEDULE_TIME_DOMAIN_TIMER, PIPELINE_PLAYBACK_SCHED_COMP_1) # Compress Playback pipeline 4 on Compr 1 using max 2 channels of s32le. @@ -98,7 +98,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-codec-adapter-playback.m4, 4, 1, 2, s32le, 5000, 0, 0, 48000, 48000, 48000, - SCHEDULE_TIME_DOMAIN_DMA, + SCHEDULE_TIME_DOMAIN_TIMER, PIPELINE_PLAYBACK_SCHED_COMP_1) # Connect pipelines together @@ -120,7 +120,7 @@ SectionGraph."PIPE_NAME" { DAI_ADD(sof/pipe-dai-capture.m4, 2, SAI, SAI_INDEX, DAI_BE_NAME, PIPELINE_SINK_2, 2, s32le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM definitions diff --git a/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 b/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 index b3fcea341ab1..d896ef2819b4 100644 --- a/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 @@ -46,7 +46,7 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4, 1, ESAI, 0, esai0-cs42888, NOT_USED_IGNORED, 2, s24le, - 1000, 1, 0, SCHEDULE_TIME_DOMAIN_DMA, + 1000, 1, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, 48000) # PCM Playback pipeline 3 on PCM 0 using max 2 channels of s24le. @@ -56,7 +56,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 3, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000, - SCHEDULE_TIME_DOMAIN_DMA, + SCHEDULE_TIME_DOMAIN_TIMER, PIPELINE_PLAYBACK_SCHED_COMP_1) # PCM Playback pipeline 4 on PCM 1 using max 2 channels of s24le. @@ -66,7 +66,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 4, 1, 2, s24le, 5000, 0, 0, 48000, 48000, 48000, - SCHEDULE_TIME_DOMAIN_DMA, + SCHEDULE_TIME_DOMAIN_TIMER, PIPELINE_PLAYBACK_SCHED_COMP_1) # Connect pipelines together @@ -88,7 +88,7 @@ SectionGraph."PIPE_NAME" { DAI_ADD(sof/pipe-dai-capture.m4, 2, ESAI, 0, esai0-cs42888, PIPELINE_SINK_2, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM definitions diff --git a/tools/topology/topology1/sof-imx8-cs42888.m4 b/tools/topology/topology1/sof-imx8-cs42888.m4 index 49d4de3324fb..1bf89135ab05 100644 --- a/tools/topology/topology1/sof-imx8-cs42888.m4 +++ b/tools/topology/topology1/sof-imx8-cs42888.m4 @@ -59,14 +59,14 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, ESAI, 0, esai0-cs42888, PIPELINE_SOURCE_1, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ESAI0 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, ESAI, 0, esai0-cs42888, PIPELINE_SINK_2, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 diff --git a/tools/topology/topology1/sof-imx8-nocodec-sai.m4 b/tools/topology/topology1/sof-imx8-nocodec-sai.m4 index b77fe0537975..150610477251 100644 --- a/tools/topology/topology1/sof-imx8-nocodec-sai.m4 +++ b/tools/topology/topology1/sof-imx8-nocodec-sai.m4 @@ -52,7 +52,7 @@ dnl deadline, priority, core) DAI_ADD(sof/pipe-dai-playback.m4, 1, SAI, 1, NoCodec-0, PIPELINE_SOURCE_1, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/topology1/sof-imx8-nocodec.m4 b/tools/topology/topology1/sof-imx8-nocodec.m4 index aa33e86d0f38..caf52acdf0e1 100644 --- a/tools/topology/topology1/sof-imx8-nocodec.m4 +++ b/tools/topology/topology1/sof-imx8-nocodec.m4 @@ -52,7 +52,7 @@ dnl deadline, priority, core) DAI_ADD(sof/pipe-dai-playback.m4, 1, ESAI, 0, NoCodec-0, PIPELINE_SOURCE_1, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/topology1/sof-imx8-wm8960-cs42888.m4 b/tools/topology/topology1/sof-imx8-wm8960-cs42888.m4 index 3864add58a46..8034dbefde8a 100644 --- a/tools/topology/topology1/sof-imx8-wm8960-cs42888.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960-cs42888.m4 @@ -73,28 +73,28 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, ESAI, 0, esai0-cs42888, PIPELINE_SOURCE_1, 2, s24le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ESAI0 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, ESAI, 0, esai0-cs42888, PIPELINE_SINK_2, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SAI1 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, 3, SAI, 1, sai1-wm8960-hifi, PIPELINE_SOURCE_3, 2, s32le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SAI1 using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, SAI, 1, sai1-wm8960-hifi, PIPELINE_SINK_4, 2, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) diff --git a/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 b/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 index 44e2ecf8e83b..2203b5504ddf 100644 --- a/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 @@ -56,7 +56,7 @@ DAI_ADD(sof/pipe-dai-capture.m4, 1, SAI, 1, sai1-wm8960-hifi, PIPELINE_SINK_1, 2, s32le, KWD_PIPE_SCH_DEADLINE_US, - 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # keyword detector pipe dnl PIPELINE_PCM_ADD(pipeline, diff --git a/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 index d95db75fe709..a89986d91ec7 100644 --- a/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 @@ -57,7 +57,7 @@ define(`DAI_BE_NAME', concat(concat(`sai', SAI_INDEX), STREAM_NAME)) DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4, 1, SAI, SAI_INDEX, DAI_BE_NAME, NOT_USED_IGNORED, 2, s32le, - 1000, 1, 0, SCHEDULE_TIME_DOMAIN_DMA, + 1000, 1, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, `RATE') # PCM Playback pipeline 3 on PCM 0 using max 2 channels of s32le. @@ -67,7 +67,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 3, 0, 2, s32le, 1000, 0, 0, `RATE', `RATE', `RATE', - SCHEDULE_TIME_DOMAIN_DMA, + SCHEDULE_TIME_DOMAIN_TIMER, PIPELINE_PLAYBACK_SCHED_COMP_1) # PCM Playback pipeline 4 on PCM 1 using max 2 channels of s32le. @@ -77,7 +77,7 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, 4, 1, 2, s32le, 5000, 0, 0, `RATE', `RATE', `RATE', - SCHEDULE_TIME_DOMAIN_DMA, + SCHEDULE_TIME_DOMAIN_TIMER, PIPELINE_PLAYBACK_SCHED_COMP_1) # Connect pipelines together @@ -99,7 +99,7 @@ SectionGraph."PIPE_NAME" { DAI_ADD(sof/pipe-dai-capture.m4, 2, SAI, SAI_INDEX, DAI_BE_NAME, PIPELINE_SINK_2, 2, s32le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM definitions diff --git a/tools/topology/topology1/sof-imx8-wm8960.m4 b/tools/topology/topology1/sof-imx8-wm8960.m4 index 3628bc5392e9..1d5c3b9b02a2 100644 --- a/tools/topology/topology1/sof-imx8-wm8960.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960.m4 @@ -70,14 +70,14 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SAI, SAI_INDEX, DAI_BE_NAME, PIPELINE_SOURCE_1, 2, s32le, - 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SAI_SAI_INDEX using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SAI, SAI_INDEX, DAI_BE_NAME, PIPELINE_SINK_2, 2, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0