Skip to content
This repository was archived by the owner on Jan 17, 2019. It is now read-only.

Conversation

@xiulipan
Copy link
Contributor

@xiulipan xiulipan commented Jul 6, 2018

Fix topology for sof_apl_pcm512x and test topology used on UP2.
Now both test and sof_apl_pcm512x topologies can load on UP2.
Need machine driver thesofproject/linux#12

xiulipan added 2 commits July 6, 2018 17:54
For nocodec topology, we need the id to be same with SSP index since
all SSP ports are enabled in nocodec. Codec machine drivers always have
id to 0.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
SSP5 id should be kept to 0 and new added DMIC goes to 1 to keep old
machine driver work with both old topology and this topology.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
@lgirdwood lgirdwood merged commit ff8eb10 into thesofproject:master Jul 6, 2018
#
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT,
ifelse(index(TEST_DAI_LINK_NAME, NoCodec), -1, 0 ,TEST_DAI_PORT),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can make everybody happy at the moment, but considering that we actually use same machine driver for normal(soft/topology/xx.m4) and test(soft/topology/test/xx) tplg files. In this case, only the first BE dai_link(with .id=0) works with test tplg file, all others doesn't work.

But I can imagine that adding an extra param for it may introduce more effort, especially for batch tplgs generated with scripts.

Copy link
Contributor

@keyonjie keyonjie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks good to me.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants