1 files changed, 14 insertions, 4 deletions

diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
index b6ef6f78dc78..fe99f461aff0 100644
--- a/sound/soc/spear/spdif_out.c
+++ b/sound/soc/spear/spdif_out.c
@@ -18,10 +18,12 @@
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <sound/dmaengine_pcm.h>
 #include <sound/soc.h>
 #include <sound/spear_dma.h>
 #include <sound/spear_spdif.h>
 #include "spdif_out_regs.h"
+#include "spear_pcm.h"
 
 struct spdif_out_params {
         u32 rate;
@@ -35,6 +37,8 @@ struct spdif_out_dev {
         struct spdif_out_params saved_params;
         u32 running;
         void __iomem *io_base;
+        struct snd_dmaengine_dai_dma_data dma_params_tx;
+        struct snd_dmaengine_pcm_config config;
 };
 
 static void spdif_out_configure(struct spdif_out_dev *host)
@@ -244,7 +248,8 @@ static int spdif_soc_dai_probe(struct snd_soc_dai *dai)
 {
         struct spdif_out_dev *host = snd_soc_dai_get_drvdata(dai);
 
-        dai->playback_dma_data = &host->dma_params;
+        host->dma_params_tx.filter_data = &host->dma_params;
+        dai->playback_dma_data = &host->dma_params_tx;
 
         return snd_soc_add_dai_controls(dai, spdif_out_controls,
                                 ARRAY_SIZE(spdif_out_controls));
@@ -280,6 +285,7 @@ static int spdif_out_probe(struct platform_device *pdev)
         struct spdif_out_dev *host;
         struct spear_spdif_platform_data *pdata;
         struct resource *res;
+        int ret;
 
         host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
         if (!host) {
@@ -302,12 +308,16 @@ static int spdif_out_probe(struct platform_device *pdev)
         host->dma_params.addr = res->start + SPDIF_OUT_FIFO_DATA;
         host->dma_params.max_burst = 16;
         host->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-        host->dma_params.filter = pdata->filter;
 
         dev_set_drvdata(&pdev->dev, host);
 
-        return devm_snd_soc_register_component(&pdev->dev, &spdif_out_component,
-                                               &spdif_out_dai, 1);
+        ret = devm_snd_soc_register_component(&pdev->dev, &spdif_out_component,
+                                              &spdif_out_dai, 1);
+        if (ret)
+                return ret;
+
+        return devm_spear_pcm_platform_register(&pdev->dev, &host->config,
+                                                pdata->filter);
 }
 
 #ifdef CONFIG_PM