Commit d7a42e10 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: ep93xx-pcm: Use dmaengine PCM helper functions

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
Tested-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7a08cf70
config SND_EP93XX_SOC config SND_EP93XX_SOC
tristate "SoC Audio support for the Cirrus Logic EP93xx series" tristate "SoC Audio support for the Cirrus Logic EP93xx series"
depends on ARCH_EP93XX && SND_SOC depends on ARCH_EP93XX && SND_SOC
select SND_SOC_DMAENGINE_PCM
help help
Say Y or M if you want to add support for codecs attached to Say Y or M if you want to add support for codecs attached to
the EP93xx I2S or AC97 interfaces. the EP93xx I2S or AC97 interfaces.
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/hardware.h> #include <mach/hardware.h>
...@@ -52,26 +53,6 @@ static const struct snd_pcm_hardware ep93xx_pcm_hardware = { ...@@ -52,26 +53,6 @@ static const struct snd_pcm_hardware ep93xx_pcm_hardware = {
.fifo_size = 32, .fifo_size = 32,
}; };
struct ep93xx_runtime_data
{
int pointer_bytes;
int periods;
int period_bytes;
struct dma_chan *dma_chan;
struct ep93xx_dma_data dma_data;
};
static void ep93xx_pcm_dma_callback(void *data)
{
struct snd_pcm_substream *substream = data;
struct ep93xx_runtime_data *rtd = substream->runtime->private_data;
rtd->pointer_bytes += rtd->period_bytes;
rtd->pointer_bytes %= rtd->period_bytes * rtd->periods;
snd_pcm_period_elapsed(substream);
}
static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param) static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param)
{ {
struct ep93xx_dma_data *data = filter_param; struct ep93xx_dma_data *data = filter_param;
...@@ -86,98 +67,48 @@ static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param) ...@@ -86,98 +67,48 @@ static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param)
static int ep93xx_pcm_open(struct snd_pcm_substream *substream) static int ep93xx_pcm_open(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *soc_rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_dai *cpu_dai = soc_rtd->cpu_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct ep93xx_pcm_dma_params *dma_params; struct ep93xx_pcm_dma_params *dma_params;
struct ep93xx_runtime_data *rtd; struct ep93xx_dma_data *dma_data;
dma_cap_mask_t mask;
int ret; int ret;
ret = snd_pcm_hw_constraint_integer(substream->runtime,
SNDRV_PCM_HW_PARAM_PERIODS);
if (ret < 0)
return ret;
snd_soc_set_runtime_hwparams(substream, &ep93xx_pcm_hardware); snd_soc_set_runtime_hwparams(substream, &ep93xx_pcm_hardware);
rtd = kmalloc(sizeof(*rtd), GFP_KERNEL); dma_data = kmalloc(sizeof(*dma_data), GFP_KERNEL);
if (!rtd) if (!dma_data)
return -ENOMEM; return -ENOMEM;
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
dma_cap_set(DMA_CYCLIC, mask);
dma_params = snd_soc_dai_get_dma_data(cpu_dai, substream); dma_params = snd_soc_dai_get_dma_data(cpu_dai, substream);
rtd->dma_data.port = dma_params->dma_port; dma_data->port = dma_params->dma_port;
rtd->dma_data.name = dma_params->name; dma_data->name = dma_params->name;
dma_data->direction = snd_pcm_substream_to_dma_direction(substream);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
rtd->dma_data.direction = DMA_MEM_TO_DEV;
else
rtd->dma_data.direction = DMA_DEV_TO_MEM;
rtd->dma_chan = dma_request_channel(mask, ep93xx_pcm_dma_filter,
&rtd->dma_data);
if (!rtd->dma_chan) {
kfree(rtd);
return -EINVAL;
}
substream->runtime->private_data = rtd;
return 0;
}
static int ep93xx_pcm_close(struct snd_pcm_substream *substream) ret = snd_dmaengine_pcm_open(substream, ep93xx_pcm_dma_filter, dma_data);
{ if (ret) {
struct ep93xx_runtime_data *rtd = substream->runtime->private_data; kfree(dma_data);
return ret;
}
dma_release_channel(rtd->dma_chan); snd_dmaengine_pcm_set_data(substream, dma_data);
kfree(rtd);
return 0;
}
static int ep93xx_pcm_dma_submit(struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct ep93xx_runtime_data *rtd = runtime->private_data;
struct dma_chan *chan = rtd->dma_chan;
struct dma_device *dma_dev = chan->device;
struct dma_async_tx_descriptor *desc;
rtd->pointer_bytes = 0;
desc = dma_dev->device_prep_dma_cyclic(chan, runtime->dma_addr,
rtd->period_bytes * rtd->periods,
rtd->period_bytes,
rtd->dma_data.direction);
if (!desc)
return -EINVAL;
desc->callback = ep93xx_pcm_dma_callback;
desc->callback_param = substream;
dmaengine_submit(desc);
return 0; return 0;
} }
static void ep93xx_pcm_dma_flush(struct snd_pcm_substream *substream) static int ep93xx_pcm_close(struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct dma_data *dma_data = snd_dmaengine_pcm_get_data(substream);
struct ep93xx_runtime_data *rtd = runtime->private_data;
dmaengine_terminate_all(rtd->dma_chan); snd_dmaengine_pcm_close(substream);
kfree(dma_data);
return 0;
} }
static int ep93xx_pcm_hw_params(struct snd_pcm_substream *substream, static int ep93xx_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_pcm_runtime *runtime = substream->runtime;
struct ep93xx_runtime_data *rtd = runtime->private_data;
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
rtd->periods = params_periods(params);
rtd->period_bytes = params_period_bytes(params);
return 0; return 0;
} }
...@@ -187,41 +118,6 @@ static int ep93xx_pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -187,41 +118,6 @@ static int ep93xx_pcm_hw_free(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int ep93xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
{
int ret;
ret = 0;
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
ret = ep93xx_pcm_dma_submit(substream);
break;
case SNDRV_PCM_TRIGGER_STOP:
case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
ep93xx_pcm_dma_flush(substream);
break;
default:
ret = -EINVAL;
break;
}
return ret;
}
static snd_pcm_uframes_t ep93xx_pcm_pointer(struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct ep93xx_runtime_data *rtd = substream->runtime->private_data;
/* FIXME: implement this with sub-period granularity */
return bytes_to_frames(runtime, rtd->pointer_bytes);
}
static int ep93xx_pcm_mmap(struct snd_pcm_substream *substream, static int ep93xx_pcm_mmap(struct snd_pcm_substream *substream,
struct vm_area_struct *vma) struct vm_area_struct *vma)
{ {
...@@ -239,8 +135,8 @@ static struct snd_pcm_ops ep93xx_pcm_ops = { ...@@ -239,8 +135,8 @@ static struct snd_pcm_ops ep93xx_pcm_ops = {
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = ep93xx_pcm_hw_params, .hw_params = ep93xx_pcm_hw_params,
.hw_free = ep93xx_pcm_hw_free, .hw_free = ep93xx_pcm_hw_free,
.trigger = ep93xx_pcm_trigger, .trigger = snd_dmaengine_pcm_trigger,
.pointer = ep93xx_pcm_pointer, .pointer = snd_dmaengine_pcm_pointer,
.mmap = ep93xx_pcm_mmap, .mmap = ep93xx_pcm_mmap,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment