1 files changed, 13 insertions, 7 deletions

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 41a6136e3535..d31dc52fa862 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -370,7 +370,6 @@ static int mxs_saif_startup(struct snd_pcm_substream *substream,
                            struct snd_soc_dai *cpu_dai)
 {
         struct mxs_saif *saif = snd_soc_dai_get_drvdata(cpu_dai);
-        snd_soc_dai_set_dma_data(cpu_dai, substream, &saif->dma_param);
 
         /* clear error status to 0 for each re-open */
         saif->fifo_underrun = 0;
@@ -606,6 +605,8 @@ static int mxs_saif_dai_probe(struct snd_soc_dai *dai)
         struct mxs_saif *saif = dev_get_drvdata(dai->dev);
 
         snd_soc_dai_set_drvdata(dai, saif);
+        dai->playback_dma_data = &saif->dma_param;
+        dai->capture_dma_data = &saif->dma_param;
 
         return 0;
 }
@@ -628,6 +629,10 @@ static struct snd_soc_dai_driver mxs_saif_dai = {
         .ops = &mxs_saif_dai_ops,
 };
 
+static const struct snd_soc_component_driver mxs_saif_component = {
+        .name           = "mxs-saif",
+};
+
 static irqreturn_t mxs_saif_irq(int irq, void *dev_id)
 {
         struct mxs_saif *saif = dev_id;
@@ -754,9 +759,9 @@ static int mxs_saif_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        saif->dma_param.chan_irq = platform_get_irq(pdev, 1);
-        if (saif->dma_param.chan_irq < 0) {
-                ret = saif->dma_param.chan_irq;
+        saif->dma_param.dma_data.chan_irq = platform_get_irq(pdev, 1);
+        if (saif->dma_param.dma_data.chan_irq < 0) {
+                ret = saif->dma_param.dma_data.chan_irq;
                 dev_err(&pdev->dev, "failed to get dma irq resource: %d\n",
                         ret);
                 return ret;
@@ -764,7 +769,8 @@ static int mxs_saif_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, saif);
 
-        ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai);
+        ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
+                                         &mxs_saif_dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "register DAI failed\n");
                 return ret;
@@ -779,7 +785,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
         return 0;
 
 failed_pdev_alloc:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         return ret;
 }
@@ -787,7 +793,7 @@ failed_pdev_alloc:
 static int mxs_saif_remove(struct platform_device *pdev)
 {
         mxs_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         return 0;
 }