1 files changed, 43 insertions, 21 deletions

diff --git a/sound/soc/blackfin/bf5xx-tdm-pcm.c b/sound/soc/blackfin/bf5xx-tdm-pcm.c
index 6bac1ac1a315..07cfc7a9e49a 100644
--- a/sound/soc/blackfin/bf5xx-tdm-pcm.c
+++ b/sound/soc/blackfin/bf5xx-tdm-pcm.c
@@ -154,7 +154,12 @@ static snd_pcm_uframes_t bf5xx_pcm_pointer(struct snd_pcm_substream *substream)
 
 static int bf5xx_pcm_open(struct snd_pcm_substream *substream)
 {
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct sport_device *sport_handle = snd_soc_dai_get_drvdata(cpu_dai);
         struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_dma_buffer *buf = &substream->dma_buffer;
+
         int ret = 0;
 
         snd_soc_set_runtime_hwparams(substream, &bf5xx_pcm_hardware);
@@ -164,9 +169,14 @@ static int bf5xx_pcm_open(struct snd_pcm_substream *substream)
         if (ret < 0)
                 goto out;
 
-        if (sport_handle != NULL)
+        if (sport_handle != NULL) {
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                        sport_handle->tx_buf = buf->area;
+                else
+                        sport_handle->rx_buf = buf->area;
+
                 runtime->private_data = sport_handle;
-        else {
+        } else {
                 pr_err("sport_handle is NULL\n");
                 ret = -ENODEV;
         }
@@ -249,11 +259,6 @@ static int bf5xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
         }
         buf->bytes = size;
 
-        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-                sport_handle->tx_buf = buf->area;
-        else
-                sport_handle->rx_buf = buf->area;
-
         return 0;
 }
 
@@ -274,8 +279,6 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm)
                 dma_free_coherent(NULL, buf->bytes, buf->area, 0);
                 buf->area = NULL;
         }
-        if (sport_handle)
-                sport_done(sport_handle);
 }
 
 static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
@@ -290,14 +293,14 @@ static int bf5xx_pcm_tdm_new(struct snd_card *card, struct snd_soc_dai *dai,
         if (!card->dev->coherent_dma_mask)
                 card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
 
-        if (dai->playback.channels_min) {
+        if (dai->driver->playback.channels_min) {
                 ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
                         SNDRV_PCM_STREAM_PLAYBACK);
                 if (ret)
                         goto out;
         }
 
-        if (dai->capture.channels_min) {
+        if (dai->driver->capture.channels_min) {
                 ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
                         SNDRV_PCM_STREAM_CAPTURE);
                 if (ret)
@@ -307,25 +310,44 @@ out:
         return ret;
 }
 
-struct snd_soc_platform bf5xx_tdm_soc_platform = {
-        .name           = "bf5xx-audio",
-        .pcm_ops        = &bf5xx_pcm_tdm_ops,
+static struct snd_soc_platform_driver bf5xx_tdm_soc_platform = {
+        .ops        = &bf5xx_pcm_tdm_ops,
         .pcm_new        = bf5xx_pcm_tdm_new,
         .pcm_free       = bf5xx_pcm_free_dma_buffers,
 };
-EXPORT_SYMBOL_GPL(bf5xx_tdm_soc_platform);
 
-static int __init bfin_pcm_tdm_init(void)
+static int __devinit bf5xx_soc_platform_probe(struct platform_device *pdev)
+{
+        return snd_soc_register_platform(&pdev->dev, &bf5xx_tdm_soc_platform);
+}
+
+static int __devexit bf5xx_soc_platform_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_platform(&pdev->dev);
+        return 0;
+}
+
+static struct platform_driver bfin_tdm_driver = {
+        .driver = {
+                        .name = "bfin-tdm-pcm-audio",
+                        .owner = THIS_MODULE,
+        },
+
+        .probe = bf5xx_soc_platform_probe,
+        .remove = __devexit_p(bf5xx_soc_platform_remove),
+};
+
+static int __init snd_bfin_tdm_init(void)
 {
-        return snd_soc_register_platform(&bf5xx_tdm_soc_platform);
+        return platform_driver_register(&bfin_tdm_driver);
 }
-module_init(bfin_pcm_tdm_init);
+module_init(snd_bfin_tdm_init);
 
-static void __exit bfin_pcm_tdm_exit(void)
+static void __exit snd_bfin_tdm_exit(void)
 {
-        snd_soc_unregister_platform(&bf5xx_tdm_soc_platform);
+        platform_driver_unregister(&bfin_tdm_driver);
 }
-module_exit(bfin_pcm_tdm_exit);
+module_exit(snd_bfin_tdm_exit);
 
 MODULE_AUTHOR("Barry Song");
 MODULE_DESCRIPTION("ADI Blackfin TDM PCM DMA module");