diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-04-15 13:19:55 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-17 09:25:56 -0400 |
commit | 610f780050090db1af024bd060f819478a656cd0 (patch) | |
tree | b45de808e58ddf8c879aa1aca49d6dc1629475a3 /sound/soc/soc-generic-dmaengine-pcm.c | |
parent | 11a8576a0a3f153784fc4fca28e6fcee83531135 (diff) |
ASoC: dmaengine-pcm: Add support for platforms which can't report residue
Unfortunately there are still quite a few platforms with a dmaengine driver
which do not support reporting the number of bytes left to transfer. If we want
to support these platforms in the generic dmaengine PCM driver we have.
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/soc-generic-dmaengine-pcm.c')
-rw-r--r-- | sound/soc/soc-generic-dmaengine-pcm.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index d6e638056389..ae0c37e66ae0 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c | |||
@@ -193,6 +193,23 @@ static const struct snd_soc_platform_driver dmaengine_pcm_platform = { | |||
193 | .probe_order = SND_SOC_COMP_ORDER_LATE, | 193 | .probe_order = SND_SOC_COMP_ORDER_LATE, |
194 | }; | 194 | }; |
195 | 195 | ||
196 | static const struct snd_pcm_ops dmaengine_no_residue_pcm_ops = { | ||
197 | .open = dmaengine_pcm_open, | ||
198 | .close = snd_dmaengine_pcm_close, | ||
199 | .ioctl = snd_pcm_lib_ioctl, | ||
200 | .hw_params = dmaengine_pcm_hw_params, | ||
201 | .hw_free = snd_pcm_lib_free_pages, | ||
202 | .trigger = snd_dmaengine_pcm_trigger, | ||
203 | .pointer = snd_dmaengine_pcm_pointer_no_residue, | ||
204 | }; | ||
205 | |||
206 | static const struct snd_soc_platform_driver dmaengine_no_residue_pcm_platform = { | ||
207 | .ops = &dmaengine_no_residue_pcm_ops, | ||
208 | .pcm_new = dmaengine_pcm_new, | ||
209 | .pcm_free = dmaengine_pcm_free, | ||
210 | .probe_order = SND_SOC_COMP_ORDER_LATE, | ||
211 | }; | ||
212 | |||
196 | static const char * const dmaengine_pcm_dma_channel_names[] = { | 213 | static const char * const dmaengine_pcm_dma_channel_names[] = { |
197 | [SNDRV_PCM_STREAM_PLAYBACK] = "tx", | 214 | [SNDRV_PCM_STREAM_PLAYBACK] = "tx", |
198 | [SNDRV_PCM_STREAM_CAPTURE] = "rx", | 215 | [SNDRV_PCM_STREAM_CAPTURE] = "rx", |
@@ -226,7 +243,11 @@ int snd_dmaengine_pcm_register(struct device *dev, | |||
226 | } | 243 | } |
227 | } | 244 | } |
228 | 245 | ||
229 | return snd_soc_add_platform(dev, &pcm->platform, | 246 | if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE) |
247 | return snd_soc_add_platform(dev, &pcm->platform, | ||
248 | &dmaengine_no_residue_pcm_platform); | ||
249 | else | ||
250 | return snd_soc_add_platform(dev, &pcm->platform, | ||
230 | &dmaengine_pcm_platform); | 251 | &dmaengine_pcm_platform); |
231 | } | 252 | } |
232 | EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_register); | 253 | EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_register); |