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

Commit 11a8576a authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: tegra: 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>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 753e23ea

sound/soc/tegra/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ config SND_SOC_TEGRA 
	tristate "SoC Audio for the Tegra System-on-Chip"

	tristate "SoC Audio for the Tegra System-on-Chip"

	depends on ARCH_TEGRA && TEGRA20_APB_DMA

	depends on ARCH_TEGRA && TEGRA20_APB_DMA

	select REGMAP_MMIO

	select REGMAP_MMIO

	select SND_SOC_DMAENGINE_PCM if TEGRA20_APB_DMA

	select SND_SOC_GENERIC_DMAENGINE_PCM if TEGRA20_APB_DMA

	help

	help

	  Say Y or M here if you want support for SoC audio on Tegra.

	  Say Y or M here if you want support for SoC audio on Tegra.

sound/soc/tegra/tegra_pcm.c

+9 −162
Original line number Original line Diff line number Diff line
@@ -29,9 +29,7 @@ 
 *

 *

 */

 */





#include <linux/dma-mapping.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <sound/core.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/pcm_params.h>
@@ -55,175 +53,24 @@ static const struct snd_pcm_hardware tegra_pcm_hardware = { 
	.fifo_size		= 4,

	.fifo_size		= 4,

};

};





static int tegra_pcm_open(struct snd_pcm_substream *substream)

static const struct snd_dmaengine_pcm_config tegra_dmaengine_pcm_config = {

{

	.pcm_hardware = &tegra_pcm_hardware,

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	.prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,

	struct device *dev = rtd->platform->dev;

	.compat_filter_fn = NULL,

	int ret;

	.prealloc_buffer_size = PAGE_SIZE * 8,



	/* Set HW params now that initialization is complete */

	snd_soc_set_runtime_hwparams(substream, &tegra_pcm_hardware);



	ret = snd_dmaengine_pcm_open_request_chan(substream, NULL, NULL);

	if (ret) {

		dev_err(dev, "dmaengine pcm open failed with err %d\n", ret);

		return ret;

	}



	return 0;

}



static int tegra_pcm_hw_params(struct snd_pcm_substream *substream,

				struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct device *dev = rtd->platform->dev;

	struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream);

	struct dma_slave_config slave_config;

	int ret;



	ret = snd_hwparams_to_dma_slave_config(substream, params,

						&slave_config);

	if (ret) {

		dev_err(dev, "hw params config failed with err %d\n", ret);

		return ret;

	}



	snd_dmaengine_pcm_set_config_from_dai_data(substream,

			snd_soc_dai_get_dma_data(rtd->cpu_dai, substream),

			&slave_config);



	ret = dmaengine_slave_config(chan, &slave_config);

	if (ret < 0) {

		dev_err(dev, "dma slave config failed with err %d\n", ret);

		return ret;

	}



	snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);

	return 0;

}



static int tegra_pcm_hw_free(struct snd_pcm_substream *substream)

{

	snd_pcm_set_runtime_buffer(substream, NULL);

	return 0;

}



static int tegra_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 tegra_pcm_ops = {

	.open		= tegra_pcm_open,

	.close		= snd_dmaengine_pcm_close_release_chan,

	.ioctl		= snd_pcm_lib_ioctl,

	.hw_params	= tegra_pcm_hw_params,

	.hw_free	= tegra_pcm_hw_free,

	.trigger	= snd_dmaengine_pcm_trigger,

	.pointer	= snd_dmaengine_pcm_pointer,

	.mmap		= tegra_pcm_mmap,

};



static int tegra_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)

{

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

	struct snd_dma_buffer *buf = &substream->dma_buffer;

	size_t size = tegra_pcm_hardware.buffer_bytes_max;



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

						&buf->addr, GFP_KERNEL);

	if (!buf->area)

		return -ENOMEM;



	buf->dev.type = SNDRV_DMA_TYPE_DEV;

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

	buf->private_data = NULL;

	buf->bytes = size;



	return 0;

}



static void tegra_pcm_deallocate_dma_buffer(struct snd_pcm *pcm, int stream)

{

	struct snd_pcm_substream *substream;

	struct snd_dma_buffer *buf;



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

	if (!substream)

		return;



	buf = &substream->dma_buffer;

	if (!buf->area)

		return;



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

				buf->area, buf->addr);

	buf->area = NULL;

}



static u64 tegra_dma_mask = DMA_BIT_MASK(32);



static int tegra_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

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

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;



	if (!card->dev->dma_mask)

		card->dev->dma_mask = &tegra_dma_mask;

	if (!card->dev->coherent_dma_mask)

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



	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = tegra_pcm_preallocate_dma_buffer(pcm,

						SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto err;

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		ret = tegra_pcm_preallocate_dma_buffer(pcm,

						SNDRV_PCM_STREAM_CAPTURE);

		if (ret)

			goto err_free_play;

	}



	return 0;



err_free_play:

	tegra_pcm_deallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK);

err:

	return ret;

}



static void tegra_pcm_free(struct snd_pcm *pcm)

{

	tegra_pcm_deallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE);

	tegra_pcm_deallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK);

}



static struct snd_soc_platform_driver tegra_pcm_platform = {

	.ops		= &tegra_pcm_ops,

	.pcm_new	= tegra_pcm_new,

	.pcm_free	= tegra_pcm_free,

};

};





int tegra_pcm_platform_register(struct device *dev)

int tegra_pcm_platform_register(struct device *dev)

{

{

	return snd_soc_register_platform(dev, &tegra_pcm_platform);

	return snd_dmaengine_pcm_register(dev, &tegra_dmaengine_pcm_config,

			SND_DMAENGINE_PCM_FLAG_NO_DT |

			SND_DMAENGINE_PCM_FLAG_COMPAT);

}

}

EXPORT_SYMBOL_GPL(tegra_pcm_platform_register);

EXPORT_SYMBOL_GPL(tegra_pcm_platform_register);





void tegra_pcm_platform_unregister(struct device *dev)

void tegra_pcm_platform_unregister(struct device *dev)

{

{

	snd_soc_unregister_platform(dev);

	return snd_dmaengine_pcm_unregister(dev);

}

}

EXPORT_SYMBOL_GPL(tegra_pcm_platform_unregister);

EXPORT_SYMBOL_GPL(tegra_pcm_platform_unregister);