summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-28 10:47:38 +0900
committerMark Brown <broonie@kernel.org>2019-06-28 15:12:59 +0100
commitbb6630d153a16e0cde1e849fcf298d8fec0e77bb (patch)
tree249e1b324b570a1f39ba510b38cadc4ea1ade33d
parent9213866ac48fbe1f76211b5e539ef4e0011ddd0d (diff)
ASoC: kirkwood: armada-370-db: consider CPU-Platform possibility
commit 717f16331712 ("ASoC: kirkwood: armada-370-db: 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 717f16331712 ("ASoC: kirkwood: armada-370-db: don't select unnecessary Platform") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/kirkwood/armada-370-db.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/soc/kirkwood/armada-370-db.c b/sound/soc/kirkwood/armada-370-db.c
index fcf84a54ad16..8c3c808bda9a 100644
--- a/sound/soc/kirkwood/armada-370-db.c
+++ b/sound/soc/kirkwood/armada-370-db.c
@@ -56,15 +56,18 @@ static const struct snd_soc_dapm_route a370db_route[] = {
SND_SOC_DAILINK_DEFS(analog,
DAILINK_COMP_ARRAY(COMP_CPU("i2s")),
- DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi")));
+ DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi")),
+ DAILINK_COMP_ARRAY(COMP_EMPTY()));
SND_SOC_DAILINK_DEFS(spdif_out,
DAILINK_COMP_ARRAY(COMP_CPU("spdif")),
- DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi")));
+ DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi")),
+ DAILINK_COMP_ARRAY(COMP_EMPTY()));
SND_SOC_DAILINK_DEFS(spdif_in,
DAILINK_COMP_ARRAY(COMP_CPU("spdif")),
- DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi")));
+ DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi")),
+ DAILINK_COMP_ARRAY(COMP_EMPTY()));
static struct snd_soc_dai_link a370db_dai[] = {
{
@@ -108,18 +111,21 @@ static int a370db_probe(struct platform_device *pdev)
a370db_dai[0].cpus->of_node =
of_parse_phandle(pdev->dev.of_node,
"marvell,audio-controller", 0);
+ a370db_dai[0].platforms->of_node = a370db_dai[0].cpus->of_node;
a370db_dai[0].codecs->of_node =
of_parse_phandle(pdev->dev.of_node,
"marvell,audio-codec", 0);
a370db_dai[1].cpus->of_node = a370db_dai[0].cpus->of_node;
+ a370db_dai[1].platforms->of_node = a370db_dai[0].cpus->of_node;
a370db_dai[1].codecs->of_node =
of_parse_phandle(pdev->dev.of_node,
"marvell,audio-codec", 1);
a370db_dai[2].cpus->of_node = a370db_dai[0].cpus->of_node;
+ a370db_dai[2].platforms->of_node = a370db_dai[0].cpus->of_node;
a370db_dai[2].codecs->of_node =
of_parse_phandle(pdev->dev.of_node,