Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c85fa502 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 52b3a884 9b9ae16a

arch/arm/plat-samsung/s3c-dma-ops.c

+11 −2
Original line number Diff line number Diff line
@@ -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)

{

	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)

		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;

	}



	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;

}

sound/soc/samsung/dma.c

+7 −0
Original line number Diff line number Diff line
@@ -90,6 +90,13 @@ static void dma_enqueue(struct snd_pcm_substream *substream) 
	dma_info.period = prtd->dma_period;

	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) {

		pr_debug("dma_loaded: %d\n", prtd->dma_loaded);