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

Commit 610f7800 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: dmaengine-pcm: Add support for platforms which can't report residue 



Unfortunately there are still quite a few platforms with a dmaengine driver
which do not support reporting the number of bytes left to transfer. If we want
to support these platforms in the generic dmaengine PCM driver we have.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 11a8576a

include/sound/dmaengine_pcm.h

+5 −0
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ void snd_dmaengine_pcm_set_config_from_dai_data( 
 * makes sense if SND_DMAENGINE_PCM_FLAG_COMPAT is set as well.

 */

#define SND_DMAENGINE_PCM_FLAG_NO_DT BIT(1)

/*

 * The platforms dmaengine driver does not support reporting the ammount of

 * bytes that are still left to transfer.

 */

#define SND_DMAENGINE_PCM_FLAG_NO_RESIDUE BIT(2)



/**

 * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM

sound/soc/soc-generic-dmaengine-pcm.c

+22 −1
Original line number Diff line number Diff line
@@ -193,6 +193,23 @@ static const struct snd_soc_platform_driver dmaengine_pcm_platform = { 
	.probe_order	= SND_SOC_COMP_ORDER_LATE,

};



static const struct snd_pcm_ops dmaengine_no_residue_pcm_ops = {

	.open		= dmaengine_pcm_open,

	.close		= snd_dmaengine_pcm_close,

	.ioctl		= snd_pcm_lib_ioctl,

	.hw_params	= dmaengine_pcm_hw_params,

	.hw_free	= snd_pcm_lib_free_pages,

	.trigger	= snd_dmaengine_pcm_trigger,

	.pointer	= snd_dmaengine_pcm_pointer_no_residue,

};



static const struct snd_soc_platform_driver dmaengine_no_residue_pcm_platform = {

	.ops		= &dmaengine_no_residue_pcm_ops,

	.pcm_new	= dmaengine_pcm_new,

	.pcm_free	= dmaengine_pcm_free,

	.probe_order	= SND_SOC_COMP_ORDER_LATE,

};



static const char * const dmaengine_pcm_dma_channel_names[] = {

	[SNDRV_PCM_STREAM_PLAYBACK] = "tx",

	[SNDRV_PCM_STREAM_CAPTURE] = "rx",
@@ -226,6 +243,10 @@ int snd_dmaengine_pcm_register(struct device *dev, 
		}

	}



	if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE)

		return snd_soc_add_platform(dev, &pcm->platform,

				&dmaengine_no_residue_pcm_platform);

	else

		return snd_soc_add_platform(dev, &pcm->platform,

				&dmaengine_pcm_platform);

}