Hi Mark,
On Tue, Nov 12, 2013 at 7:18 PM, Mark Brown <broonie@xxxxxxxxxx> wrote:
> From: Mark Brown <broonie@xxxxxxxxxx>
>
> Since all Exynos platforms have been converted to dmaengine and many of
> the older platforms are in the process of conversion they do not need to
> use the legacy s3c-dma APIs for DMA but can instead use the standard ASoC
> dmaengine helpers. This both allows them to benefit from improvements
> implemented in the generic code and supports multiplatform.
>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
> ---
>
> This depends on Tomasz's s3c64xx dmaengine conversion since that is how
> I've tested it - if possible I'd like to get that merged into ASoC and
> SPI early after -rc1, since I maintian both trees it's possibly easiest
> if I go ahead any apply it?
>
> sound/soc/samsung/Kconfig | 13 +++++--
> sound/soc/samsung/Makefile | 6 ++--
> sound/soc/samsung/dma.h | 3 ++
> sound/soc/samsung/dmaengine.c | 82 +++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 100 insertions(+), 4 deletions(-)
> create mode 100644 sound/soc/samsung/dmaengine.c
>
[snip]
> void samsung_asoc_init_dma_data(struct snd_soc_dai *dai,
> diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c
> new file mode 100644
> index 0000000..ad0a371
> --- /dev/null
> +++ b/sound/soc/samsung/dmaengine.c
> @@ -0,0 +1,82 @@
> +/*
> + * dmaengine.c - Samsung dmaengine wrapper
> + *
> + * Author: Mark Brown <broonie@xxxxxxxxxx>
> + * Copyright 2013 Linaro
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + *
> + */
> +
> +#include <linux/module.h>
> +#include <linux/amba/pl08x.h>
> +
> +#include <sound/core.h>
> +#include <sound/pcm.h>
> +#include <sound/pcm_params.h>
> +#include <sound/dmaengine_pcm.h>
> +#include <sound/soc.h>
> +#include <sound/soc-dai.h>
> +
> +#include "dma.h"
> +
> +#ifdef CONFIG_ARCH_S3C64XX
> +#define filter_fn pl08x_filter_id
> +#else
> +#define filter_fn NULL
> +#endif
> +
> +static const struct snd_dmaengine_pcm_config samsung_dmaengine_pcm_config = {
> + .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
> + .compat_filter_fn = filter_fn,
> +};
> +
> +void samsung_asoc_init_dma_data(struct snd_soc_dai *dai,
> + struct s3c_dma_params *playback,
> + struct s3c_dma_params *capture)
> +{
> + struct snd_dmaengine_dai_dma_data *playback_data = NULL;
> + struct snd_dmaengine_dai_dma_data *capture_data = NULL;
> +
> + if (playback) {
> + playback_data = &playback->dma_data;
> + playback_data->filter_data = (void *)playback->channel;
> + playback_data->chan_name = playback->ch_name;
> + playback_data->addr = playback->dma_addr;
> + playback_data->addr_width = playback->dma_size;
> + }
> + if (capture) {
> + capture_data = &capture->dma_data;
> + capture_data->filter_data = (void *)capture->channel;
> + capture_data->chan_name = capture->ch_name;
> + capture_data->addr = capture->dma_addr;
> + capture_data->addr_width = capture->dma_size;
> + }
> +
> + snd_soc_dai_init_dma_data(dai, playback_data, capture_data);
> +}
> +EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);
> +
> +int samsung_asoc_dma_platform_register(struct device *dev)
> +{
> + return snd_dmaengine_pcm_register(dev, &samsung_dmaengine_pcm_config,
> + SND_DMAENGINE_PCM_FLAG_COMPAT);
also need to pass flag SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME here?
I tested this patch set on smdk5420 i2s. During playback audio playing
fast and there is underrun error like below.
underrun!!! (at least 0.061 ms long)
underrun!!! (at least 0.043 ms long)
Thanks
Padma
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
