OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <cujomalainey@google.com>
This commit is contained in:
Curtis Malainey 2019-09-19 13:12:11 -07:00 committed by Tomasz Lauda
parent ccba8e0668
commit aa3b18ed71
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/topology/sof-cht-max98090.m4
View File

@ -41,6 +41,19 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
1000, 0, 0, 1000, 0, 0,
48000, 48000, 48000) 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. # PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
# 4000us deadline on core 0 with priority 1 # 4000us deadline on core 0 with priority 1
PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 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 # capture DAI is SSP2 using 2 periods
# Buffers use s16le format, 1000us deadline on core 0 with priority 0 # Buffers use s16le format, 1000us deadline on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4, DAI_ADD(sof/pipe-dai-capture.m4,