summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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,