aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2009-11-18 19:49:54 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-11-19 05:48:27 -0500
commit2b7b250df74f1f9e15cdf33fa90f6c98a419842d (patch)
tree119002a0778d0be261538abfa8899205de35d16b /sound/soc/davinci
parent1e224f322bf22280957a5f76164d848526ed9b08 (diff)
ASoC: DaVinci: use edma_pause, edma_resume
Use edma_pause and edma_resume to make missing dma_events less likely. This may not be needed, but it looks better. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci')
-rw-r--r--sound/soc/davinci/davinci-pcm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 664d49336508..ad4d7f47a86b 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -528,12 +528,12 @@ static int davinci_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
528 case SNDRV_PCM_TRIGGER_START: 528 case SNDRV_PCM_TRIGGER_START:
529 case SNDRV_PCM_TRIGGER_RESUME: 529 case SNDRV_PCM_TRIGGER_RESUME:
530 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: 530 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
531 edma_start(prtd->asp_channel); 531 edma_resume(prtd->asp_channel);
532 break; 532 break;
533 case SNDRV_PCM_TRIGGER_STOP: 533 case SNDRV_PCM_TRIGGER_STOP:
534 case SNDRV_PCM_TRIGGER_SUSPEND: 534 case SNDRV_PCM_TRIGGER_SUSPEND:
535 case SNDRV_PCM_TRIGGER_PAUSE_PUSH: 535 case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
536 edma_stop(prtd->asp_channel); 536 edma_pause(prtd->asp_channel);
537 break; 537 break;
538 default: 538 default:
539 ret = -EINVAL; 539 ret = -EINVAL;
@@ -568,6 +568,7 @@ static int davinci_pcm_prepare(struct snd_pcm_substream *substream)
568 /* copy 1st iram buffer */ 568 /* copy 1st iram buffer */
569 edma_start(prtd->ram_channel); 569 edma_start(prtd->ram_channel);
570 } 570 }
571 edma_start(prtd->asp_channel);
571 return 0; 572 return 0;
572 } 573 }
573 prtd->period = 0; 574 prtd->period = 0;
@@ -577,6 +578,7 @@ static int davinci_pcm_prepare(struct snd_pcm_substream *substream)
577 edma_read_slot(prtd->asp_link[0], &prtd->asp_params); 578 edma_read_slot(prtd->asp_link[0], &prtd->asp_params);
578 edma_write_slot(prtd->asp_channel, &prtd->asp_params); 579 edma_write_slot(prtd->asp_channel, &prtd->asp_params);
579 davinci_pcm_enqueue_dma(substream); 580 davinci_pcm_enqueue_dma(substream);
581 edma_start(prtd->asp_channel);
580 582
581 return 0; 583 return 0;
582} 584}