ASoC: add support for separate codec DAIs to the fsl_dma driver

Some codecs have separate DAIs for playback and capture, so the DMA driver
should allocate a DMA buffer only for the streams that are valid when the
driver is opened.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 21 insertions, 13 deletions

diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 57774cb91ae3..5a6f56d63756 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -303,21 +303,29 @@ static int fsl_dma_new(struct snd_card *card, struct snd_soc_dai *dai,
         if (!card->dev->coherent_dma_mask)
                 card->dev->coherent_dma_mask = fsl_dma_dmamask;
 
-        ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev,
-                fsl_dma_hardware.buffer_bytes_max,
-                &pcm->streams[0].substream->dma_buffer);
-        if (ret) {
-                dev_err(card->dev, "can't allocate playback dma buffer\n");
-                return ret;
+        /* Some codecs have separate DAIs for playback and capture, so we
+         * should allocate a DMA buffer only for the streams that are valid.
+         */
+
+        if (dai->driver->playback.channels_min) {
+                ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev,
+                        fsl_dma_hardware.buffer_bytes_max,
+                        &pcm->streams[0].substream->dma_buffer);
+                if (ret) {
+                        dev_err(card->dev, "can't alloc playback dma buffer\n");
+                        return ret;
+                }
         }
 
-        ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev,
-                fsl_dma_hardware.buffer_bytes_max,
-                &pcm->streams[1].substream->dma_buffer);
-        if (ret) {
-                snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer);
-                dev_err(card->dev, "can't allocate capture dma buffer\n");
-                return ret;
+        if (dai->driver->capture.channels_min) {
+                ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev,
+                        fsl_dma_hardware.buffer_bytes_max,
+                        &pcm->streams[1].substream->dma_buffer);
+                if (ret) {
+                        snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer);
+                        dev_err(card->dev, "can't alloc capture dma buffer\n");
+                        return ret;
+                }
         }
 
         return 0;