]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: qcom: consider CPU-Platform possibility
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 28 Jun 2019 01:49:48 +0000 (10:49 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 28 Jun 2019 14:20:34 +0000 (15:20 +0100)
commit 0814c6412967 ("ASoC: qcom: 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 0814c6412967 ("ASoC: qcom: don't select unnecessary Platform")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/common.c

index adf49b1987546b648dd5deddc95c4ad3b43d2cbe..97488b5cc5157a5ba9a1c3f3fcf77803e9b9f5b0 100644 (file)
@@ -103,9 +103,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
                        link->codecs     = dlc;
                        link->num_codecs = 1;
 
-                       link->platforms = NULL;
-                       link->num_platforms = 0;
-
+                       link->platforms->of_node = link->cpus->of_node;
                        link->codecs->dai_name = "snd-soc-dummy-dai";
                        link->codecs->name = "snd-soc-dummy";
                        link->dynamic = 1;