This repository has been archived by the owner on Jan 17, 2019. It is now read-only.
topology fix for UP2 #19
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>
This was referenced Jul 6, 2018
lgirdwood
approved these changes
Jul 6, 2018
keyonjie
reviewed
Jul 7, 2018
| @@ -85,7 +85,9 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) | |||
| # | |||
| # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT | |||
| # | |||
| 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), | |||
There was a problem hiding this comment.
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.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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