aboutsummaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto2019-06-28 10:49:44 +0900
committerMark Brown2019-06-28 15:20:14 +0100
commit9f3eb917534511f2e275b7cf63ed76374ade77bc (patch)
treea58d5481cd4079b85efd22c1ad5d09d36f013d8c /sound/soc
parent0296de83a6ca002c6ded44baed914ffdb66f709c (diff)
ASoC: simple-card-utils: consider CPU-Platform possibility
commit 6f0437445735 ("ASoC: simple-card-utils: don't select unnecessary Platform") Current ALSA SoC avoid to add duplicate component to rtd, and this driver was selecting CPU component as Platform component. Thus, above patch removed Platform settings from this driver, because it assumed these are same component. But, some CPU driver is using generic DMAEngine, in such case, both CPU component and Platform component will have same of_node/name. In other words, there are some components which are different but have same of_node/name. In such case, Card driver definitely need to select Platform even though it is same as CPU. It is depends on CPU driver, but is difficult to know it from Card driver. This patch reverts above patch. Fixes: commit 6f0437445735 ("ASoC: simple-card-utils: don't select unnecessary Platform") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/generic/simple-card-utils.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 3cf5cb21ea52..ac8678fe55ff 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -346,18 +346,9 @@ EXPORT_SYMBOL_GPL(asoc_simple_dai_init);
void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link)
{
- /*
- * no Platform
- *
- * It will be waste of memory, but not be memory leak.
- * see
- * asoc_simple_init_priv()
- * asoc_simple_priv
- */
- if (!dai_link->platforms->of_node) {
- dai_link->platforms = NULL;
- dai_link->num_platforms = 0;
- }
+ /* Assumes platform == cpu */
+ if (!dai_link->platforms->of_node)
+ dai_link->platforms->of_node = dai_link->cpus->of_node;
}
EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform);