Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: atmel-pcm: use generic dmaengine framework

Browse source 
Align atmel pcm to use ASoC generic dmaengine framework

DMA is fully device tree based

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Bo Shen 2013-07-03 16:38:00 +08:00 committed by Mark Brown
parent 10175b3b2f
commit 95e0e07e71
2 changed files with 17 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sound/soc/atmel/Kconfig
View file

@ -13,6 +13,7 @@ config SND_ATMEL_SOC_PDC
config SND_ATMEL_SOC_DMA config SND_ATMEL_SOC_DMA
tristate tristate
depends on SND_ATMEL_SOC depends on SND_ATMEL_SOC
select SND_SOC_GENERIC_DMAENGINE_PCM
config SND_ATMEL_SOC_SSC config SND_ATMEL_SOC_SSC
tristate tristate

104
sound/soc/atmel/atmel-pcm-dma.c
View file

@ -89,124 +89,52 @@ static void atmel_pcm_dma_irq(u32 ssc_sr,
} }
} }
/*--------------------------------------------------------------------------*\
* DMAENGINE operations
\*--------------------------------------------------------------------------*/
static bool filter(struct dma_chan *chan, void *slave)
{
struct at_dma_slave *sl = slave;
if (sl->dma_dev == chan->device->dev) {
chan->private = sl;
return true;
} else {
return false;
}
}
static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream, static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct atmel_pcm_dma_params *prtd) struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct atmel_pcm_dma_params *prtd;
struct ssc_device *ssc; struct ssc_device *ssc;
struct dma_chan *dma_chan;
struct dma_slave_config slave_config;
int ret; int ret;
prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
ssc = prtd->ssc; ssc = prtd->ssc;
ret = snd_hwparams_to_dma_slave_config(substream, params, ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config);
&slave_config);
if (ret) { if (ret) {
pr_err("atmel-pcm: hwparams to dma slave configure failed\n"); pr_err("atmel-pcm: hwparams to dma slave configure failed\n");
return ret; return ret;
} }
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
slave_config.dst_addr = (dma_addr_t)ssc->phybase + SSC_THR; slave_config->dst_addr = ssc->phybase + SSC_THR;
slave_config.dst_maxburst = 1; slave_config->dst_maxburst = 1;
} else { } else {
slave_config.src_addr = (dma_addr_t)ssc->phybase + SSC_RHR; slave_config->src_addr = ssc->phybase + SSC_RHR;
slave_config.src_maxburst = 1; slave_config->src_maxburst = 1;
}
dma_chan = snd_dmaengine_pcm_get_chan(substream);
if (dmaengine_slave_config(dma_chan, &slave_config)) {
pr_err("atmel-pcm: failed to configure dma channel\n");
ret = -EBUSY;
return ret;
}
return 0;
}
static int atmel_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct atmel_pcm_dma_params *prtd;
struct ssc_device *ssc;
struct at_dma_slave *sdata = NULL;
int ret;
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
ssc = prtd->ssc;
if (ssc->pdev)
sdata = ssc->pdev->dev.platform_data;
ret = snd_dmaengine_pcm_open_request_chan(substream, filter, sdata);
if (ret) {
pr_err("atmel-pcm: dmaengine pcm open failed\n");
return -EINVAL;
}
ret = atmel_pcm_configure_dma(substream, params, prtd);
if (ret) {
pr_err("atmel-pcm: failed to configure dmai\n");
goto err;
} }
prtd->dma_intr_handler = atmel_pcm_dma_irq; prtd->dma_intr_handler = atmel_pcm_dma_irq;
return 0; return 0;
err:
snd_dmaengine_pcm_close_release_chan(substream);
return ret;
} }
static int atmel_pcm_open(struct snd_pcm_substream *substream) static const struct snd_dmaengine_pcm_config atmel_dmaengine_pcm_config = {
{ .prepare_slave_config = atmel_pcm_configure_dma,
snd_soc_set_runtime_hwparams(substream, &atmel_pcm_dma_hardware); .pcm_hardware = &atmel_pcm_dma_hardware,
.prealloc_buffer_size = ATMEL_SSC_DMABUF_SIZE,
return 0;
}
static struct snd_pcm_ops atmel_pcm_ops = {
.open = atmel_pcm_open,
.close = snd_dmaengine_pcm_close_release_chan,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = atmel_pcm_hw_params,
.trigger = snd_dmaengine_pcm_trigger,
.pointer = snd_dmaengine_pcm_pointer_no_residue,
.mmap = atmel_pcm_mmap,
};
static struct snd_soc_platform_driver atmel_soc_platform = {
.ops = &atmel_pcm_ops,
.pcm_new = atmel_pcm_new,
.pcm_free = atmel_pcm_free,
}; };
int atmel_pcm_dma_platform_register(struct device *dev) int atmel_pcm_dma_platform_register(struct device *dev)
{ {
return snd_soc_register_platform(dev, &atmel_soc_platform); return snd_dmaengine_pcm_register(dev, &atmel_dmaengine_pcm_config,
SND_DMAENGINE_PCM_FLAG_NO_RESIDUE);
} }
EXPORT_SYMBOL(atmel_pcm_dma_platform_register); EXPORT_SYMBOL(atmel_pcm_dma_platform_register);
void atmel_pcm_dma_platform_unregister(struct device *dev) void atmel_pcm_dma_platform_unregister(struct device *dev)
{ {
snd_soc_unregister_platform(dev); snd_dmaengine_pcm_unregister(dev);
} }
EXPORT_SYMBOL(atmel_pcm_dma_platform_unregister); EXPORT_SYMBOL(atmel_pcm_dma_platform_unregister);