ASoC: Blackfin: push down SPORT settings from global variables

Now that we have multi-component support, take the time to unify the
SPORT implementations a bit and make the setup dynamic.  This kills
off the global sport_handle which was shared across all the Blackfin
machine drivers.  The pin management aspect is off loaded to platform
resources, and now multiple SPORTs can be instantiated simultaneously.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Scott Jiang <scott.jiang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 12 insertions, 9 deletions

diff --git a/sound/soc/blackfin/bf5xx-tdm-pcm.c b/sound/soc/blackfin/bf5xx-tdm-pcm.c
index d1bd745d72cf..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);