summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-28 10:49:22 +0900
committerMark Brown <broonie@kernel.org>2019-06-28 15:19:05 +0100
commitb407a17a14475eea74e66ae6b531390ac0ea011c (patch)
tree87924542430b926388cd42bfa89283d9afd6b863 /sound
parent44e578150f48e9e2517b41cdcababde0b0d0bfa4 (diff)
downloadlinux-b407a17a14475eea74e66ae6b531390ac0ea011c.tar.gz
linux-b407a17a14475eea74e66ae6b531390ac0ea011c.tar.bz2
linux-b407a17a14475eea74e66ae6b531390ac0ea011c.zip
ASoC: ti: omap-abe-twl6040: consider CPU-Platform possibility
commit 1306ab2eddd1 ("ASoC: ti: omap-abe-twl6040: 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 1306ab2eddd1 ("ASoC: ti: omap-abe-twl6040: 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')
-rw-r--r--sound/soc/ti/omap-abe-twl6040.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/sound/soc/ti/omap-abe-twl6040.c b/sound/soc/ti/omap-abe-twl6040.c
index 5572f5a8de9f..6d564ab5e437 100644
--- a/sound/soc/ti/omap-abe-twl6040.c
+++ b/sound/soc/ti/omap-abe-twl6040.c
@@ -21,17 +21,17 @@
#include "omap-mcpdm.h"
#include "../codecs/twl6040.h"
-SND_SOC_DAILINK_DEF(link0_cpus,
- DAILINK_COMP_ARRAY(COMP_EMPTY()));
-SND_SOC_DAILINK_DEF(link0_codecs,
+SND_SOC_DAILINK_DEFS(link0,
+ DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC("twl6040-codec",
- "twl6040-legacy")));
-
-SND_SOC_DAILINK_DEF(link1_cpus,
+ "twl6040-legacy")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
-SND_SOC_DAILINK_DEF(link1_codecs,
+
+SND_SOC_DAILINK_DEFS(link1,
+ DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec",
- "dmic-hifi")));
+ "dmic-hifi")),
+ DAILINK_COMP_ARRAY(COMP_EMPTY()));
struct abe_twl6040 {
struct snd_soc_card card;
@@ -256,6 +256,9 @@ static int omap_abe_probe(struct platform_device *pdev)
priv->dai_links[0].cpus = link0_cpus;
priv->dai_links[0].num_cpus = 1;
priv->dai_links[0].cpus->of_node = dai_node;
+ priv->dai_links[0].platforms = link0_platforms;
+ priv->dai_links[0].num_platforms = 1;
+ priv->dai_links[0].platforms->of_node = dai_node;
priv->dai_links[0].codecs = link0_codecs;
priv->dai_links[0].num_codecs = 1;
priv->dai_links[0].init = omap_abe_twl6040_init;
@@ -269,6 +272,9 @@ static int omap_abe_probe(struct platform_device *pdev)
priv->dai_links[1].cpus = link1_cpus;
priv->dai_links[1].num_cpus = 1;
priv->dai_links[1].cpus->of_node = dai_node;
+ priv->dai_links[1].platforms = link1_platforms;
+ priv->dai_links[1].num_platforms = 1;
+ priv->dai_links[1].platforms->of_node = dai_node;
priv->dai_links[1].codecs = link1_codecs;
priv->dai_links[1].num_codecs = 1;
priv->dai_links[1].init = omap_abe_dmic_init;