aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/imx-pcm.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-04-15 19:19:59 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-17 14:26:33 +0100
commitadaa3229fbb88532e0d460afad779efbfb92ffeb (patch)
tree1ea22aba1d3ee1abcc27ab8f10365dddb4ad487f /sound/soc/fsl/imx-pcm.c
parentfc8ba7f94d84e1ccd351e41c778e36710834334e (diff)
downloadkernel_goldelico_gta04-adaa3229fbb88532e0d460afad779efbfb92ffeb.zip
kernel_goldelico_gta04-adaa3229fbb88532e0d460afad779efbfb92ffeb.tar.gz
kernel_goldelico_gta04-adaa3229fbb88532e0d460afad779efbfb92ffeb.tar.bz2
ASoC: imx: Use generic dmaengine PCM
Use the generic dmaengine PCM driver instead of a custom implementation. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl/imx-pcm.c')
-rw-r--r--sound/soc/fsl/imx-pcm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-pcm.c b/sound/soc/fsl/imx-pcm.c
index 0d0625b..c498964 100644
--- a/sound/soc/fsl/imx-pcm.c
+++ b/sound/soc/fsl/imx-pcm.c
@@ -114,7 +114,11 @@ static int imx_pcm_probe(struct platform_device *pdev)
static int imx_pcm_remove(struct platform_device *pdev)
{
- snd_soc_unregister_platform(&pdev->dev);
+ if (strcmp(pdev->id_entry->name, "imx-fiq-pcm-audio") == 0)
+ snd_soc_unregister_platform(&pdev->dev);
+ else
+ imx_pcm_dma_exit(pdev);
+
return 0;
}