lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/samsung' into tmp

Browse Source
This commit is contained in:
Mark Brown
2013-08-30 11:04:29 +01:00
parent 52b3a88439 9b9ae16a97
commit c85fa502ef
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/plat-samsung/s3c-dma-ops.c
View File

@@ -82,7 +82,8 @@ static int s3c_dma_config(unsigned ch, struct samsung_dma_config *param)
static int s3c_dma_prepare(unsigned ch, struct samsung_dma_prep *param) static int s3c_dma_prepare(unsigned ch, struct samsung_dma_prep *param)
{ {
struct cb_data *data; struct cb_data *data;
int len = (param->cap == DMA_CYCLIC) ? param->period : param->len; dma_addr_t pos = param->buf;
dma_addr_t end = param->buf + param->len;
list_for_each_entry(data, &dma_list, node) list_for_each_entry(data, &dma_list, node)
if (data->ch == ch) if (data->ch == ch)
@@ -94,7 +95,15 @@ static int s3c_dma_prepare(unsigned ch, struct samsung_dma_prep *param)
data->fp_param = param->fp_param; data->fp_param = param->fp_param;
} }
s3c2410_dma_enqueue(ch, (void *)data, param->buf, len); if (param->cap != DMA_CYCLIC) {
s3c2410_dma_enqueue(ch, (void *)data, param->buf, param->len);
return 0;
}
while (pos < end) {
s3c2410_dma_enqueue(ch, (void *)data, pos, param->period);
pos += param->period;
}
return 0; return 0;
} }

7
sound/soc/samsung/dma.c
View File

@@ -90,6 +90,13 @@ static void dma_enqueue(struct snd_pcm_substream *substream)
dma_info.period = prtd->dma_period; dma_info.period = prtd->dma_period;
dma_info.len = prtd->dma_period*limit; dma_info.len = prtd->dma_period*limit;
if (dma_info.cap == DMA_CYCLIC) {
dma_info.buf = pos;
prtd->params->ops->prepare(prtd->params->ch, &dma_info);
prtd->dma_loaded += limit;
return;
}
while (prtd->dma_loaded < limit) { while (prtd->dma_loaded < limit) {
pr_debug("dma_loaded: %d\n", prtd->dma_loaded); pr_debug("dma_loaded: %d\n", prtd->dma_loaded);