diff options
| author | Zidan Wang <zidan.wang@freescale.com> | 2015-09-10 10:59:35 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-09-17 09:24:26 -0500 |
| commit | 8b609b5a7ae9aaf711d6919a02a4f0b39ae83de7 (patch) | |
| tree | e58ec64ca54f89157523943ba87cf0cc04821958 /sound | |
| parent | 1055874dd925d2d75037e4125aaa1294c2734a73 (diff) | |
ASoC: pcm_dmaengine: pause/resume interface have been supported in dma driver
Revert "MLK-10213-2: ASoC: dmaengine: Merge trigger RESUME to START and SUSPEND to STOP"
This reverts commit a21f8a846f653fe5415961fe8006f0f9688fe908.
commit 0e8928f has supported pause/resume interface in dma driver. So no
need to merge trigger RESUME to START and SUSPEND to STOP any more.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm_dmaengine.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index f01528fb892c..d658d2ed2179 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -5,7 +5,7 @@ * Based on: * imx-pcm-dma-mx2.c, Copyright 2009 Sascha Hauer <s.hauer@pengutronix.de> * mxs-pcm.c, Copyright (C) 2011 Freescale Semiconductor, Inc. - * imx-pcm-dma.c, Copyright (C) 2014-2015 Freescale Semiconductor, Inc. + * imx-pcm-dma.c, Copyright (C) 2014 Freescale Semiconductor, Inc. * ep93xx-pcm.c, Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> * Copyright (C) 2006 Applied Data Systems * @@ -183,16 +183,20 @@ int snd_dmaengine_pcm_trigger(struct snd_pcm_substream *substream, int cmd) switch (cmd) { case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ret = dmaengine_pcm_prepare_and_submit(substream); if (ret) return ret; dma_async_issue_pending(prtd->dma_chan); break; - case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + dmaengine_resume(prtd->dma_chan); + break; case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + dmaengine_pause(prtd->dma_chan); + break; + case SNDRV_PCM_TRIGGER_STOP: dmaengine_terminate_all(prtd->dma_chan); break; default: |