summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel/atmel-pcm-dma.c
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2013-07-03 16:37:58 +0800
committerMark Brown <broonie@linaro.org>2013-07-15 11:07:56 +0100
commitcede8d7aaa60bd7c03b9ec5eb43b09714710b8ba (patch)
treef65ecb09ebbe7150db67eecdd48719493de8ec67 /sound/soc/atmel/atmel-pcm-dma.c
parentf1b0dd8b9377590b387fd21ba67081ed0e7111e3 (diff)
ASoC: atmel-pcm-dma: move prepare for dma to dai prepare
as prepare callback for dma is acctually access ssc register which better done in dai driver, so move it to dai prepare callback function Signed-off-by: Bo Shen <voice.shen@atmel.com> Reviewed-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/atmel/atmel-pcm-dma.c')
-rw-r--r--sound/soc/atmel/atmel-pcm-dma.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c
index 1d38fd0bc4e..5a57803cb18 100644
--- a/sound/soc/atmel/atmel-pcm-dma.c
+++ b/sound/soc/atmel/atmel-pcm-dma.c
@@ -175,19 +175,6 @@ err:
return ret;
}
-static int atmel_pcm_dma_prepare(struct snd_pcm_substream *substream)
-{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct atmel_pcm_dma_params *prtd;
-
- prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
- ssc_writex(prtd->ssc->regs, SSC_IER, prtd->mask->ssc_error);
- ssc_writex(prtd->ssc->regs, SSC_CR, prtd->mask->ssc_enable);
-
- return 0;
-}
-
static int atmel_pcm_open(struct snd_pcm_substream *substream)
{
snd_soc_set_runtime_hwparams(substream, &atmel_pcm_dma_hardware);
@@ -200,7 +187,6 @@ static struct snd_pcm_ops atmel_pcm_ops = {
.close = snd_dmaengine_pcm_close_release_chan,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = atmel_pcm_hw_params,
- .prepare = atmel_pcm_dma_prepare,
.trigger = snd_dmaengine_pcm_trigger,
.pointer = snd_dmaengine_pcm_pointer_no_residue,
.mmap = atmel_pcm_mmap,