From 58bf722a18e48ca4f588ad3ff0968fd24d4ad599 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Fri, 17 Jan 2025 15:30:30 +0200 Subject: [PATCH] tools: topology1: imx8mp: Switch to time domain timer After commit eac3c4470a13 ("imx8mp: Switch to native drivers and timer domain") we no longer use DMA domain for scheduling. Fix topologies to use time domain timer. Signed-off-by: Daniel Baluta --- tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4 | 4 ++-- tools/topology/topology1/sof-imx8mp-compr-pcm-cap-wm8960.m4 | 2 +- tools/topology/topology1/sof-imx8mp-compr-pcm-wm8960.m4 | 2 +- tools/topology/topology1/sof-imx8mp-compr-wm8960.m4 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4 b/tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4 index 8c581b7a760a..207a4a2e6eb5 100644 --- a/tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4 +++ b/tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4 @@ -79,7 +79,7 @@ dnl deadline, priority, core) DAI_ADD(sof/pipe-dai-playback.m4, 1, SAI, 2, sai2-bt-sco-pcm-wb, PIPELINE_SOURCE_1, 2, s16le, - DEADLINE, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + DEADLINE, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI SAI2 using 2 periods DAI_ADD(sof/pipe-dai-capture.m4, @@ -91,7 +91,7 @@ DAI_ADD(sof/pipe-dai-capture.m4, DAI_ADD(sof/pipe-dai-playback.m4, 3, SAI, 3, sai3-bt-sco-pcm-wb, PIPELINE_SOURCE_3, 2, s16le, - DEADLINE, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + DEADLINE, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI SAI3 using 2 periods DAI_ADD(sof/pipe-dai-capture.m4, diff --git a/tools/topology/topology1/sof-imx8mp-compr-pcm-cap-wm8960.m4 b/tools/topology/topology1/sof-imx8mp-compr-pcm-cap-wm8960.m4 index 9eb27880c4f5..c86876be902d 100644 --- a/tools/topology/topology1/sof-imx8mp-compr-pcm-cap-wm8960.m4 +++ b/tools/topology/topology1/sof-imx8mp-compr-pcm-cap-wm8960.m4 @@ -75,7 +75,7 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 1, SAI, 3, sai3-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/sof-imx8mp-compr-pcm-wm8960.m4 b/tools/topology/topology1/sof-imx8mp-compr-pcm-wm8960.m4 index c518430b01c5..73f787e6900c 100644 --- a/tools/topology/topology1/sof-imx8mp-compr-pcm-wm8960.m4 +++ b/tools/topology/topology1/sof-imx8mp-compr-pcm-wm8960.m4 @@ -75,7 +75,7 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SAI, 3, sai3-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/sof-imx8mp-compr-wm8960.m4 b/tools/topology/topology1/sof-imx8mp-compr-wm8960.m4 index e74caff6b27c..de620e1e3644 100644 --- a/tools/topology/topology1/sof-imx8mp-compr-wm8960.m4 +++ b/tools/topology/topology1/sof-imx8mp-compr-wm8960.m4 @@ -91,7 +91,7 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SAI, 3, 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