From aa3b18ed7189eedda00a5ba2b16ac62b9f6342fc Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 19 Sep 2019 13:12:11 -0700 Subject: [PATCH] topology: sof-cht-max98090 move DAI definition above media pipeline The DAI definition needs to come first otherwise the media pipeline with be parsed incorrectly resulting in a failure to load the topology Signed-off-by: Curtis Malainey --- tools/topology/sof-cht-max98090.m4 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/topology/sof-cht-max98090.m4 b/tools/topology/sof-cht-max98090.m4 index 91785f8b1..4bec8dad1 100644 --- a/tools/topology/sof-cht-max98090.m4 +++ b/tools/topology/sof-cht-max98090.m4 @@ -41,6 +41,19 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 1000, 0, 0, 48000, 48000, 48000) +# +# DAI configuration +# +# SSP port 2 is our only pipeline DAI +# + +# playback DAI is SSP2 using 2 periods +# Buffers use s16le format, 1000us deadline on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 1, SSP, 2, SSP2-Codec, + PIPELINE_SOURCE_1, 2, s16le, + 1000, 0, 0) + # PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. # 4000us deadline on core 0 with priority 1 PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, @@ -59,19 +72,6 @@ SectionGraph."pipe-cht-max98090" { ] } -# -# DAI configuration -# -# SSP port 2 is our only pipeline DAI -# - -# playback DAI is SSP2 using 2 periods -# Buffers use s16le format, 1000us deadline on core 0 with priority 0 -DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, SSP2-Codec, - PIPELINE_SOURCE_1, 2, s16le, - 1000, 0, 0) - # capture DAI is SSP2 using 2 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4,