diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index d32ae8702d18..1150c74d4830 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -38,7 +38,6 @@ set(TPLGS "sof-byt-codec\;sof-byt-rt5682\;-DCODEC=RT5682" "sof-byt-codec\;sof-byt-da7213\;-DCODEC=DA7213" "sof-cnl-rt274\;sof-cnl-rt274" - "sof-hsw-rt5640\;sof-hsw-rt5640" "sof-apl-tdf8532\;sof-apl-tdf8532" "sof-apl-pcm512x\;sof-apl-pcm512x" "sof-apl-pcm512x-nohdmi\;sof-apl-pcm512x-nohdmi" diff --git a/tools/topology/platform/intel/intel-generic-dmic.m4 b/tools/topology/platform/intel/intel-generic-dmic.m4 index 31dd7fa61b30..125300b070f5 100644 --- a/tools/topology/platform/intel/intel-generic-dmic.m4 +++ b/tools/topology/platform/intel/intel-generic-dmic.m4 @@ -46,14 +46,14 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, DMIC_PIPELINE_48k_ID, DMIC, 0, dmic01, concat(`PIPELINE_SINK_', DMIC_PIPELINE_48k_ID), 2, s32le, - 1000, 0, 0, 48000, 48000, 48000) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 1 using 2 periods # Buffers use s32le format, with 16 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, DMIC_PIPELINE_16k_ID, DMIC, 1, dmic16k, concat(`PIPELINE_SINK_', DMIC_PIPELINE_16k_ID), 2, s32le, - 1000, 0, 0, 16000, 16000, 16000) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) dnl PCM_CAPTURE_ADD(name, pipeline, capture) diff --git a/tools/topology/sof-bdw-codec.m4 b/tools/topology/sof-bdw-codec.m4 index d660e5dd7f20..5310a75c0307 100644 --- a/tools/topology/sof-bdw-codec.m4 +++ b/tools/topology/sof-bdw-codec.m4 @@ -45,12 +45,27 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 1000, 0, 0, 48000, 48000, 48000) +# +# DAI configuration +# +# SSP port 0 is our only pipeline DAI +# + +# playback DAI is SSP0 using 2 periods +# 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 on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 1, 2, s32le, 2000, 0, 0, - 8000, 96000, 48000) + 8000, 96000, 48000, + SCHEDULE_TIME_DOMAIN_DMA, + PIPELINE_PLAYBACK_SCHED_COMP_1) # Connect pipelines together SectionGraph."PIPE_NAME" { @@ -62,25 +77,12 @@ SectionGraph."PIPE_NAME" { ] } -# -# DAI configuration -# -# SSP port 0 is our only pipeline DAI -# - -# playback DAI is SSP0 using 2 periods -# Buffers use s24le format, 1000us deadline on core 0 with priority 1 -DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 0, Codec, - PIPELINE_SOURCE_1, 2, s24le, - 1000, 1, 0) - # capture DAI is SSP0 using 2 periods # 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, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM Low Latency PCM_DUPLEX_ADD(Low Latency, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-byt-codec.m4 b/tools/topology/sof-byt-codec.m4 index be27101b9894..91039ec25771 100644 --- a/tools/topology/sof-byt-codec.m4 +++ b/tools/topology/sof-byt-codec.m4 @@ -62,7 +62,7 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 2, s24le, - 1000, 1, 0) + 1000, 1, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. # 4000us deadline on core 0 with priority 0 @@ -70,7 +70,8 @@ PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 1, 2, s16le, 4000, 0, 0, 8000, 96000, 48000, - 0, PIPELINE_PLAYBACK_SCHED_COMP_1) + SCHEDULE_TIME_DOMAIN_DMA, + PIPELINE_PLAYBACK_SCHED_COMP_1) # Connect pipelines together SectionGraph."PIPE_NAME" { @@ -87,7 +88,7 @@ SectionGraph."PIPE_NAME" { DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM Low Latency PCM_DUPLEX_ADD(Low Latency, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-cht-max98090.m4 b/tools/topology/sof-cht-max98090.m4 index ec1c7e2a105e..067c12aeacd7 100644 --- a/tools/topology/sof-cht-max98090.m4 +++ b/tools/topology/sof-cht-max98090.m4 @@ -52,7 +52,7 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 2, s16le, - 1000, 1, 0) + 1000, 1, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. # 4000us deadline on core 0 with priority 0 @@ -77,7 +77,7 @@ SectionGraph."pipe-cht-max98090" { DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM Low Latency PCM_DUPLEX_ADD(Low Latency, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-cht-nocodec.m4 b/tools/topology/sof-cht-nocodec.m4 index 3c5c0ce74beb..8d7758c55a66 100644 --- a/tools/topology/sof-cht-nocodec.m4 +++ b/tools/topology/sof-cht-nocodec.m4 @@ -56,7 +56,7 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, NoCodec-2, PIPELINE_SOURCE_1, 2, s24le, - 1000, 1, 0) + 1000, 1, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. # 4000us deadline on core 0 with priority 0 @@ -64,7 +64,7 @@ PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 1, 2, s32le, 4000, 0, 0, 8000, 48000, 48000, - 0, PIPELINE_PLAYBACK_SCHED_COMP_1) + SCHEDULE_TIME_DOMAIN_DMA, PIPELINE_PLAYBACK_SCHED_COMP_1) # Connect pipelines together SectionGraph."media-pipe" { @@ -81,7 +81,7 @@ SectionGraph."media-pipe" { DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 2, NoCodec-2, PIPELINE_SINK_2, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM Low Latency PCM_DUPLEX_ADD(Low Latency, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-cht-rt5682.m4 b/tools/topology/sof-cht-rt5682.m4 index 3b3a4462fb17..24cde320fe8c 100644 --- a/tools/topology/sof-cht-rt5682.m4 +++ b/tools/topology/sof-cht-rt5682.m4 @@ -48,14 +48,14 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM Low Latency PCM_DUPLEX_ADD(SSP2, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-cht-src-50khz-pcm512x.m4 b/tools/topology/sof-cht-src-50khz-pcm512x.m4 index 2e3ff32c36dd..2791dfb985eb 100644 --- a/tools/topology/sof-cht-src-50khz-pcm512x.m4 +++ b/tools/topology/sof-cht-src-50khz-pcm512x.m4 @@ -53,7 +53,7 @@ dnl deadline, priority, core) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # PCM, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-cml-rt5682.m4 b/tools/topology/sof-cml-rt5682.m4 index a45de3c8b555..a6b4e7cd26bd 100644 --- a/tools/topology/sof-cml-rt5682.m4 +++ b/tools/topology/sof-cml-rt5682.m4 @@ -159,7 +159,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, DAI_ADD(sof/pipe-dai-capture.m4, 8, DMIC, 1, dmic16k, PIPELINE_SINK_8, 2, s32le, - 16, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 diff --git a/tools/topology/sof-hsw-rt5640.m4 b/tools/topology/sof-hsw-rt5640.m4 deleted file mode 100644 index 70ae401bb41d..000000000000 --- a/tools/topology/sof-hsw-rt5640.m4 +++ /dev/null @@ -1,92 +0,0 @@ -# -# Topology for generic Haswell board with RT5640. -# - -# Include topology builder -include(`utils.m4') -include(`dai.m4') -include(`pipeline.m4') -include(`ssp.m4') - -# Include TLV library -include(`common/tlv.m4') - -# Include Token library -include(`sof/tokens.m4') - -# Include Haswell DSP configuration -include(`platform/intel/hsw.m4') - -# -# Define the pipelines -# -# PCM0 ----> volume ---------------+ -# |--low latency mixer ----> volume ----> SSP0 -# PCM1 -----> volume ----> SRC ----+ -# -# PCM0 <---- Volume <---- SSP0 -# - -# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le. -# 1000us deadline on core 0 with priority 1 -PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, - 1, 0, 2, s32le, - 1000, 1, 0, - 48000, 48000, 48000) - -# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le. -# 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) - -# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. -# 4000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, - 3, 1, 2, s32le, - 4000, 0, 0, - 8000, 96000, 48000) - -# Connect pipelines together -SectionGraph."pipe-hsw-rt5640" { - index "0" - - lines [ - # media 0 - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3) - ] -} - -# -# DAI configuration -# -# SSP port 0 is our only pipeline DAI -# - -# playback DAI is SSP0 using 2 periods -# Buffers use s24le format, 1000us deadline on core 0 with priority 1 -DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 0, Codec, - PIPELINE_SOURCE_1, 2, s24le, - 1000, 1, 0) - -# capture DAI is SSP0 using 2 periods -# 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, - 1000, 0, 0) - -# PCM Low Latency -PCM_DUPLEX_ADD(Low Latency, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) - -# -# BE configurations - overrides config in ACPI if present -# -DAI_CONFIG(SSP, 0, 0, Codec, - SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_slave), - SSP_CLOCK(fsync, 48000, codec_slave), - SSP_TDM(2, 25, 3, 3), - SSP_CONFIG_DATA(SSP, 0, 24))) diff --git a/tools/topology/sof-imx8qxp-cs42888.m4 b/tools/topology/sof-imx8qxp-cs42888.m4 index 60f97bb8ca0d..85fe43fadc40 100644 --- a/tools/topology/sof-imx8qxp-cs42888.m4 +++ b/tools/topology/sof-imx8qxp-cs42888.m4 @@ -59,7 +59,7 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, ESAI, 0, ESAI0-Codec, PIPELINE_SOURCE_1, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # capture DAI is ESAI0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 diff --git a/tools/topology/sof-imx8qxp-nocodec-sai.m4 b/tools/topology/sof-imx8qxp-nocodec-sai.m4 index a68649632620..0bb539453158 100644 --- a/tools/topology/sof-imx8qxp-nocodec-sai.m4 +++ b/tools/topology/sof-imx8qxp-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) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-imx8qxp-nocodec.m4 b/tools/topology/sof-imx8qxp-nocodec.m4 index 464650fe828f..db979a74d4c9 100644 --- a/tools/topology/sof-imx8qxp-nocodec.m4 +++ b/tools/topology/sof-imx8qxp-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) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-imx8qxp-wm8960.m4 b/tools/topology/sof-imx8qxp-wm8960.m4 index fd3a92ab8e09..cc8245bb4c50 100644 --- a/tools/topology/sof-imx8qxp-wm8960.m4 +++ b/tools/topology/sof-imx8qxp-wm8960.m4 @@ -58,7 +58,7 @@ dnl period, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SAI, 1, be.wm8960-hifi, PIPELINE_SOURCE_1, 2, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) # capture DAI is SAI1 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0