ASoC: add S/PDIF support to Armada 370 DB ASoC driver

The Armada 370 DB board not only has analog audio input/output, but
also S/PDIF input/output. This commit adds support for S/PDIF in the
ASoC machine driver of the Armada 370 DB platform, and adjusts the
Device Tree bindings documentation accordingly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

2 files changed, 29 insertions, 0 deletions

diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 2dc3ecf34801..49f8437665de 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -10,6 +10,7 @@ config SND_KIRKWOOD_SOC_ARMADA370_DB
         tristate "SoC Audio support for Armada 370 DB"
         depends on SND_KIRKWOOD_SOC && (ARCH_MVEBU || COMPILE_TEST) && I2C
         select SND_SOC_CS42L51
+        select SND_SOC_SPDIF
         help
           Say Y if you want to add support for SoC audio on
           the Armada 370 Development Board.
diff --git a/sound/soc/kirkwood/armada-370-db.c b/sound/soc/kirkwood/armada-370-db.c
index 977639b3ffde..c44333849259 100644
--- a/sound/soc/kirkwood/armada-370-db.c
+++ b/sound/soc/kirkwood/armada-370-db.c
@@ -67,6 +67,20 @@ static struct snd_soc_dai_link a370db_dai[] = {
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
         .ops = &a370db_ops,
 },
+{
+        .name = "S/PDIF out",
+        .stream_name = "spdif-out",
+        .cpu_dai_name = "spdif",
+        .codec_dai_name = "dit-hifi",
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
+},
+{
+        .name = "S/PDIF in",
+        .stream_name = "spdif-in",
+        .cpu_dai_name = "spdif",
+        .codec_dai_name = "dir-hifi",
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
+},
 };
 
 static struct snd_soc_card a370db = {
@@ -95,6 +109,20 @@ static int a370db_probe(struct platform_device *pdev)
                 of_parse_phandle(pdev->dev.of_node,
                                  "marvell,audio-codec", 0);
 
+        a370db_dai[1].cpu_of_node = a370db_dai[0].cpu_of_node;
+        a370db_dai[1].platform_of_node = a370db_dai[0].cpu_of_node;
+
+        a370db_dai[1].codec_of_node =
+                of_parse_phandle(pdev->dev.of_node,
+                                 "marvell,audio-codec", 1);
+
+        a370db_dai[2].cpu_of_node = a370db_dai[0].cpu_of_node;
+        a370db_dai[2].platform_of_node = a370db_dai[0].cpu_of_node;
+
+        a370db_dai[2].codec_of_node =
+                of_parse_phandle(pdev->dev.of_node,
+                                 "marvell,audio-codec", 2);
+
         return devm_snd_soc_register_card(card->dev, card);
 }