未验证 提交 bb6630d1 编写于 作者: K Kuninori Morimoto 提交者: Mark Brown

ASoC: kirkwood: armada-370-db: consider CPU-Platform possibility

commit 717f1633 ("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 717f1633 ("ASoC: kirkwood: armada-370-db: don't select unnecessary Platform")
Signed-off-by: NKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 9213866a
...@@ -56,15 +56,18 @@ static const struct snd_soc_dapm_route a370db_route[] = { ...@@ -56,15 +56,18 @@ static const struct snd_soc_dapm_route a370db_route[] = {
SND_SOC_DAILINK_DEFS(analog, SND_SOC_DAILINK_DEFS(analog,
DAILINK_COMP_ARRAY(COMP_CPU("i2s")), 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, SND_SOC_DAILINK_DEFS(spdif_out,
DAILINK_COMP_ARRAY(COMP_CPU("spdif")), 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, SND_SOC_DAILINK_DEFS(spdif_in,
DAILINK_COMP_ARRAY(COMP_CPU("spdif")), 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[] = { static struct snd_soc_dai_link a370db_dai[] = {
{ {
...@@ -108,18 +111,21 @@ static int a370db_probe(struct platform_device *pdev) ...@@ -108,18 +111,21 @@ static int a370db_probe(struct platform_device *pdev)
a370db_dai[0].cpus->of_node = a370db_dai[0].cpus->of_node =
of_parse_phandle(pdev->dev.of_node, of_parse_phandle(pdev->dev.of_node,
"marvell,audio-controller", 0); "marvell,audio-controller", 0);
a370db_dai[0].platforms->of_node = a370db_dai[0].cpus->of_node;
a370db_dai[0].codecs->of_node = a370db_dai[0].codecs->of_node =
of_parse_phandle(pdev->dev.of_node, of_parse_phandle(pdev->dev.of_node,
"marvell,audio-codec", 0); "marvell,audio-codec", 0);
a370db_dai[1].cpus->of_node = a370db_dai[0].cpus->of_node; 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 = a370db_dai[1].codecs->of_node =
of_parse_phandle(pdev->dev.of_node, of_parse_phandle(pdev->dev.of_node,
"marvell,audio-codec", 1); "marvell,audio-codec", 1);
a370db_dai[2].cpus->of_node = a370db_dai[0].cpus->of_node; 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 = a370db_dai[2].codecs->of_node =
of_parse_phandle(pdev->dev.of_node, of_parse_phandle(pdev->dev.of_node,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册