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

Commit 52c102e5 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: spear: Use generic dmaengine PCM 



Use the generic dmaengine PCM driver instead of a custom implementation.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 46fdd8b1

sound/soc/spear/spear_pcm.c

+15 −137
Original line number Diff line number Diff line
@@ -13,19 +13,13 @@ 


#include <linux/module.h>

#include <linux/dmaengine.h>

#include <linux/dma-mapping.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/scatterlist.h>

#include <linux/slab.h>

#include <sound/core.h>

#include <sound/dmaengine_pcm.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/spear_dma.h>



static struct snd_pcm_hardware spear_pcm_hardware = {

static const struct snd_pcm_hardware spear_pcm_hardware = {

	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |

		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |

		 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
@@ -37,149 +31,33 @@ static struct snd_pcm_hardware spear_pcm_hardware = { 
	.fifo_size = 0, /* fifo size in bytes */

};



static int spear_pcm_hw_params(struct snd_pcm_substream *substream,

		struct snd_pcm_hw_params *params)

static struct dma_chan *spear_pcm_request_chan(struct snd_soc_pcm_runtime *rtd,

	struct snd_pcm_substream *substream)

{

	snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);

	struct spear_dma_data *dma_data;



	return 0;

}



static int spear_pcm_hw_free(struct snd_pcm_substream *substream)

{

	snd_pcm_set_runtime_buffer(substream, NULL);



	return 0;

}



static int spear_pcm_open(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;



	struct spear_dma_data *dma_data = (struct spear_dma_data *)

		snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);

	int ret;



	ret = snd_soc_set_runtime_hwparams(substream, &spear_pcm_hardware);

	if (ret)

		return ret;



	return snd_dmaengine_pcm_open_request_chan(substream, dma_data->filter,

				dma_data);

}



static int spear_pcm_mmap(struct snd_pcm_substream *substream,

		struct vm_area_struct *vma)

{

	struct snd_pcm_runtime *runtime = substream->runtime;



	return dma_mmap_writecombine(substream->pcm->card->dev, vma,

			runtime->dma_area, runtime->dma_addr,

			runtime->dma_bytes);

}



static struct snd_pcm_ops spear_pcm_ops = {

	.open		= spear_pcm_open,

	.close		= snd_dmaengine_pcm_close_release_chan,

	.ioctl		= snd_pcm_lib_ioctl,

	.hw_params	= spear_pcm_hw_params,

	.hw_free	= spear_pcm_hw_free,

	.trigger	= snd_dmaengine_pcm_trigger,

	.pointer	= snd_dmaengine_pcm_pointer,

	.mmap		= spear_pcm_mmap,

};



static int

spear_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream,

		size_t size)

{

	struct snd_pcm_substream *substream = pcm->streams[stream].substream;

	struct snd_dma_buffer *buf = &substream->dma_buffer;



	buf->dev.type = SNDRV_DMA_TYPE_DEV;

	buf->dev.dev = pcm->card->dev;

	buf->private_data = NULL;

	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);



	buf->area = dma_alloc_writecombine(pcm->card->dev, size,

			&buf->addr, GFP_KERNEL);

	if (!buf->area)

		return -ENOMEM;



	dev_info(buf->dev.dev,

			" preallocate_dma_buffer: area=%p, addr=%p, size=%d\n",

			(void *)buf->area, (void *)buf->addr, size);



	buf->bytes = size;

	return 0;

}



static void spear_pcm_free(struct snd_pcm *pcm)

{

	struct snd_pcm_substream *substream;

	struct snd_dma_buffer *buf;

	int stream;



	for (stream = 0; stream < 2; stream++) {

		substream = pcm->streams[stream].substream;

		if (!substream)

			continue;



		buf = &substream->dma_buffer;

		if (!buf || !buf->area)

			continue;



		dma_free_writecombine(pcm->card->dev, buf->bytes,

				buf->area, buf->addr);

		buf->area = NULL;

	}

}



static u64 spear_pcm_dmamask = DMA_BIT_MASK(32);



static int spear_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	int ret;



	if (!card->dev->dma_mask)

		card->dev->dma_mask = &spear_pcm_dmamask;

	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (rtd->cpu_dai->driver->playback.channels_min) {

		ret = spear_pcm_preallocate_dma_buffer(rtd->pcm,

				SNDRV_PCM_STREAM_PLAYBACK,

				spear_pcm_hardware.buffer_bytes_max);

		if (ret)

			return ret;

	return snd_dmaengine_pcm_request_channel(dma_data->filter, dma_data);

}



	if (rtd->cpu_dai->driver->capture.channels_min) {

		ret = spear_pcm_preallocate_dma_buffer(rtd->pcm,

				SNDRV_PCM_STREAM_CAPTURE,

				spear_pcm_hardware.buffer_bytes_max);

		if (ret)

			return ret;

	}



	return 0;

}



static struct snd_soc_platform_driver spear_soc_platform = {

	.ops		=	&spear_pcm_ops,

	.pcm_new	=	spear_pcm_new,

	.pcm_free	=	spear_pcm_free,

static const struct snd_dmaengine_pcm_config spear_dmaengine_pcm_config = {

	.pcm_hardware = &spear_pcm_hardware,

	.compat_request_channel = spear_pcm_request_chan,

	.prealloc_buffer_size = 16 * 1024,

};



static int spear_soc_platform_probe(struct platform_device *pdev)

{

	return snd_soc_register_platform(&pdev->dev, &spear_soc_platform);

	return snd_dmaengine_pcm_register(&pdev->dev,

		&spear_dmaengine_pcm_config,

		SND_DMAENGINE_PCM_FLAG_NO_DT |

		SND_DMAENGINE_PCM_FLAG_COMPAT);

}



static int spear_soc_platform_remove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);



	snd_dmaengine_pcm_unregister(&pdev->dev);

	return 0;

}