shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

audio soc dma : add audio getposition dma

Browse Source
This commit is contained in:
qjb
2014-06-10 09:17:55 +08:00
parent 68aee7b787
commit 0774031f52
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dma/pl330.c
View File

@@ -3188,6 +3188,9 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
pd->device_prep_slave_sg = pl330_prep_slave_sg;
pd->device_control = pl330_control;
pd->device_issue_pending = pl330_issue_pending;
#ifdef drivers/dma/pl330.c
pd->dma_getposition = pl330_dma_getposition;
#endif
ret = dma_async_device_register(pd);
if (ret) {

4
include/linux/dmaengine.h
View File

@@ -601,6 +601,10 @@ struct dma_device {
enum dma_status (*device_tx_status)(struct dma_chan *chan,
dma_cookie_t cookie,
struct dma_tx_state *txstate);
#ifdef CONFIG_ARCH_ROCKCHIP
int (*dma_getposition)(struct dma_chan *chan,
dma_addr_t *src, dma_addr_t *dst);
#endif
void (*device_issue_pending)(struct dma_chan *chan);
};

11
sound/soc/soc-dmaengine-pcm.c
View File

@@ -180,7 +180,7 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream)
flags |= DMA_PREP_INTERRUPT;
prtd->pos = 0;
#if CONFIG_ARCH_ROCKCHIP
#ifdef CONFIG_ARCH_ROCKCHIP
//printk("soc dma buffersize = %d , periodsize=%d, periods=%d\n",
// snd_pcm_lib_buffer_bytes(substream),
// snd_pcm_lib_period_bytes(substream),
@@ -259,6 +259,15 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_trigger);
snd_pcm_uframes_t snd_dmaengine_pcm_pointer_no_residue(struct snd_pcm_substream *substream)
{
struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
#ifdef CONFIG_ARCH_ROCKCHIP
dma_addr_t src, dst;
prtd->dma_chan->device->dma_getposition(prtd->dma_chan, &src, &dst);
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
prtd->pos = dst - substream->runtime->dma_addr;
else
prtd->pos = src - substream->runtime->dma_addr;
#endif
return bytes_to_frames(substream->runtime, prtd->pos);
}
EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_pointer_no_residue);