Commit c04019d4 authored by Timur Tabi's avatar Timur Tabi Committed by Mark Brown

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: default avatarTimur Tabi <timur@freescale.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b67696b4
...@@ -303,21 +303,29 @@ static int fsl_dma_new(struct snd_card *card, struct snd_soc_dai *dai, ...@@ -303,21 +303,29 @@ static int fsl_dma_new(struct snd_card *card, struct snd_soc_dai *dai,
if (!card->dev->coherent_dma_mask) if (!card->dev->coherent_dma_mask)
card->dev->coherent_dma_mask = fsl_dma_dmamask; card->dev->coherent_dma_mask = fsl_dma_dmamask;
ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev, /* Some codecs have separate DAIs for playback and capture, so we
fsl_dma_hardware.buffer_bytes_max, * should allocate a DMA buffer only for the streams that are valid.
&pcm->streams[0].substream->dma_buffer); */
if (ret) {
dev_err(card->dev, "can't allocate playback dma buffer\n"); if (dai->driver->playback.channels_min) {
return ret; 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, if (dai->driver->capture.channels_min) {
fsl_dma_hardware.buffer_bytes_max, ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev,
&pcm->streams[1].substream->dma_buffer); fsl_dma_hardware.buffer_bytes_max,
if (ret) { &pcm->streams[1].substream->dma_buffer);
snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer); if (ret) {
dev_err(card->dev, "can't allocate capture dma buffer\n"); snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer);
return ret; dev_err(card->dev, "can't alloc capture dma buffer\n");
return ret;
}
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment