Skip to content

Commit 2c0b416

Browse files
LaurentiuM1234LaurentiuM1234
committed
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 <laurentiu.mihalcea@nxp.com>
1 parent 4639d7c commit 2c0b416

14 files changed

Lines changed: 30 additions & 30 deletions

‎tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ dnl period, priority, core, time_domain)
7575
DAI_ADD(sof/pipe-dai-capture.m4,
7676
1, SAI, 1, sai1-wm8960-hifi,
7777
PIPELINE_SINK_1, 2, s32le,
78-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
78+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
7979

8080
# PCM Low Latency, id 0
8181

‎tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ dnl period, priority, core, time_domain)
7575
DAI_ADD(sof/pipe-dai-playback.m4,
7676
1, SAI, 1, sai1-wm8960-hifi,
7777
PIPELINE_SOURCE_1, 2, s32le,
78-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
78+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
7979

8080
# PCM Low Latency, id 0
8181

‎tools/topology/topology1/development/sof-imx8-compr-wm8960.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ dnl period, priority, core, time_domain)
9090
DAI_ADD(sof/pipe-dai-playback.m4,
9191
1, SAI, 1, DAI_BE_NAME,
9292
PIPELINE_SOURCE_1, 2, s32le,
93-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
93+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
9494

9595

9696
# PCM Low Latency, id 0

‎tools/topology/topology1/development/sof-imx8-src-cs42888.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ dnl period, priority, core, time_domain)
5959
DAI_ADD(sof/pipe-dai-playback.m4,
6060
1, ESAI, 0, esai0-cs42888,
6161
PIPELINE_SOURCE_1, 2, s24le,
62-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
62+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
6363

6464
# capture DAI is ESAI0 using 2 periods
6565
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
6666
DAI_ADD(sof/pipe-dai-capture.m4,
6767
2, ESAI, 0, esai0-cs42888,
6868
PIPELINE_SINK_2, 2, s24le,
69-
1000, 0, 0)
69+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
7070

7171
# PCM Low Latency, id 0
7272

‎tools/topology/topology1/development/sof-imx8-src-wm8960.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ dnl period, priority, core, time_domain)
6969
DAI_ADD(sof/pipe-dai-playback.m4,
7070
1, SAI, SAI_INDEX, DAI_BE_NAME,
7171
PIPELINE_SOURCE_1, 2, s32le,
72-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
72+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
7373

7474
# capture DAI is SAI_SAI_INDEX using 2 periods
7575
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
7676
DAI_ADD(sof/pipe-dai-capture.m4,
7777
2, SAI, SAI_INDEX, DAI_BE_NAME,
7878
PIPELINE_SINK_2, 2, s32le,
79-
1000, 0, 0)
79+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
8080

8181

8282
# PCM Low Latency, id 0

‎tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ define(`DAI_BE_NAME', concat(concat(`sai', SAI_INDEX), STREAM_NAME))
7878
DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4,
7979
1, SAI, SAI_INDEX, DAI_BE_NAME,
8080
NOT_USED_IGNORED, 2, s32le,
81-
1000, 1, 0, SCHEDULE_TIME_DOMAIN_DMA,
81+
1000, 1, 0, SCHEDULE_TIME_DOMAIN_TIMER,
8282
2, 48000)
8383

8484
# 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,
8888
3, 0, 2, s32le,
8989
1000, 0, 0,
9090
48000, 48000, 48000,
91-
SCHEDULE_TIME_DOMAIN_DMA,
91+
SCHEDULE_TIME_DOMAIN_TIMER,
9292
PIPELINE_PLAYBACK_SCHED_COMP_1)
9393

9494
# 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,
9898
4, 1, 2, s32le,
9999
5000, 0, 0,
100100
48000, 48000, 48000,
101-
SCHEDULE_TIME_DOMAIN_DMA,
101+
SCHEDULE_TIME_DOMAIN_TIMER,
102102
PIPELINE_PLAYBACK_SCHED_COMP_1)
103103

104104
# Connect pipelines together
@@ -120,7 +120,7 @@ SectionGraph."PIPE_NAME" {
120120
DAI_ADD(sof/pipe-dai-capture.m4,
121121
2, SAI, SAI_INDEX, DAI_BE_NAME,
122122
PIPELINE_SINK_2, 2, s32le,
123-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
123+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
124124

125125

126126
# PCM definitions

‎tools/topology/topology1/sof-imx8-cs42888-mixer.m4‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
4646
DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4,
4747
1, ESAI, 0, esai0-cs42888,
4848
NOT_USED_IGNORED, 2, s24le,
49-
1000, 1, 0, SCHEDULE_TIME_DOMAIN_DMA,
49+
1000, 1, 0, SCHEDULE_TIME_DOMAIN_TIMER,
5050
2, 48000)
5151

5252
# 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,
5656
3, 0, 2, s24le,
5757
1000, 0, 0,
5858
48000, 48000, 48000,
59-
SCHEDULE_TIME_DOMAIN_DMA,
59+
SCHEDULE_TIME_DOMAIN_TIMER,
6060
PIPELINE_PLAYBACK_SCHED_COMP_1)
6161

6262
# 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,
6666
4, 1, 2, s24le,
6767
5000, 0, 0,
6868
48000, 48000, 48000,
69-
SCHEDULE_TIME_DOMAIN_DMA,
69+
SCHEDULE_TIME_DOMAIN_TIMER,
7070
PIPELINE_PLAYBACK_SCHED_COMP_1)
7171

7272
# Connect pipelines together
@@ -88,7 +88,7 @@ SectionGraph."PIPE_NAME" {
8888
DAI_ADD(sof/pipe-dai-capture.m4,
8989
2, ESAI, 0, esai0-cs42888,
9090
PIPELINE_SINK_2, 2, s24le,
91-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
91+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
9292

9393

9494
# PCM definitions

‎tools/topology/topology1/sof-imx8-cs42888.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ dnl period, priority, core, time_domain)
5959
DAI_ADD(sof/pipe-dai-playback.m4,
6060
1, ESAI, 0, esai0-cs42888,
6161
PIPELINE_SOURCE_1, 2, s24le,
62-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
62+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
6363

6464
# capture DAI is ESAI0 using 2 periods
6565
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
6666
DAI_ADD(sof/pipe-dai-capture.m4,
6767
2, ESAI, 0, esai0-cs42888,
6868
PIPELINE_SINK_2, 2, s24le,
69-
1000, 0, 0)
69+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
7070

7171
# PCM Low Latency, id 0
7272

‎tools/topology/topology1/sof-imx8-nocodec-sai.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dnl deadline, priority, core)
5252
DAI_ADD(sof/pipe-dai-playback.m4,
5353
1, SAI, 1, NoCodec-0,
5454
PIPELINE_SOURCE_1, 2, s24le,
55-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
55+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
5656

5757
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
5858

‎tools/topology/topology1/sof-imx8-nocodec.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dnl deadline, priority, core)
5252
DAI_ADD(sof/pipe-dai-playback.m4,
5353
1, ESAI, 0, NoCodec-0,
5454
PIPELINE_SOURCE_1, 2, s24le,
55-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA)
55+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
5656

5757
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
5858

0 commit comments

Comments
 (0)