aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-04-15 13:19:48 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-17 09:17:54 -0400
commit7c1c1d4a7b4ca1266057a3632d27450f5575caf9 (patch)
tree39e53ebd108b551ba939fd13ca9e3c2f8f869400 /sound/soc/tegra
parent69b6f19622ce0aef41df884b75e3f789c64b89c0 (diff)
ASoC: dmaengine-pcm: Make requesting the DMA channel at PCM open optional
Refactor the dmaengine PCM library to allow the DMA channel to be requested before opening a PCM substream. snd_dmaengine_pcm_open() now expects a DMA channel instead of a filter function and filter parameter as its parameters. snd_dmaengine_pcm_close() is updated to not release the DMA channel. This allows a dmaengine based PCM driver to request its channels before the substream is opened. The patch also introduces two new functions, snd_dmaengine_pcm_open_request_chan() and snd_dmaengine_pcm_close_release_chan(), which have the same signature and behaviour of the old snd_dmaengine_pcm_{open,close}() and internally use the new variants of these functions. All users of snd_dmaengine_pcm_{open,close}() are updated to use snd_dmaengine_pcm_open_request_chan() and snd_dmaengine_pcm_close_release_chan(). Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Tested-by: Stephen Warren <swarren@nvidia.com> Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/tegra_pcm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c
index f91d08bc1753..32d08119dd87 100644
--- a/sound/soc/tegra/tegra_pcm.c
+++ b/sound/soc/tegra/tegra_pcm.c
@@ -66,7 +66,7 @@ static int tegra_pcm_open(struct snd_pcm_substream *substream)
66 /* Set HW params now that initialization is complete */ 66 /* Set HW params now that initialization is complete */
67 snd_soc_set_runtime_hwparams(substream, &tegra_pcm_hardware); 67 snd_soc_set_runtime_hwparams(substream, &tegra_pcm_hardware);
68 68
69 ret = snd_dmaengine_pcm_open(substream, NULL, NULL); 69 ret = snd_dmaengine_pcm_open_request_chan(substream, NULL, NULL);
70 if (ret) { 70 if (ret) {
71 dev_err(dev, "dmaengine pcm open failed with err %d\n", ret); 71 dev_err(dev, "dmaengine pcm open failed with err %d\n", ret);
72 return ret; 72 return ret;
@@ -144,7 +144,7 @@ static int tegra_pcm_mmap(struct snd_pcm_substream *substream,
144 144
145static struct snd_pcm_ops tegra_pcm_ops = { 145static struct snd_pcm_ops tegra_pcm_ops = {
146 .open = tegra_pcm_open, 146 .open = tegra_pcm_open,
147 .close = snd_dmaengine_pcm_close, 147 .close = snd_dmaengine_pcm_close_release_chan,
148 .ioctl = snd_pcm_lib_ioctl, 148 .ioctl = snd_pcm_lib_ioctl,
149 .hw_params = tegra_pcm_hw_params, 149 .hw_params = tegra_pcm_hw_params,
150 .hw_free = tegra_pcm_hw_free, 150 .hw_free = tegra_pcm_hw_free,