summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-04-20 19:29:02 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-22 11:27:23 +0100
commit8c1bb4ecbca575ec89310a50c3d3dd475bf81fd0 (patch)
tree9593859e9124fc47e25e21db27c53b37198b6931 /sound/soc
parent57364f9ae24c3a29163c23d5219bccef7bccc96a (diff)
downloadop-kernel-dev-8c1bb4ecbca575ec89310a50c3d3dd475bf81fd0.zip
op-kernel-dev-8c1bb4ecbca575ec89310a50c3d3dd475bf81fd0.tar.gz
ASoC: mxs: Setup dma data in DAI probe
This allows us to access the DAI DMA data when we create the PCM. We'll use this when converting mxs to generic DMA engine PCM driver. 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')
-rw-r--r--sound/soc/mxs/mxs-saif.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index f13bd87..d796a39 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -369,7 +369,6 @@ static int mxs_saif_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *cpu_dai)
{
struct mxs_saif *saif = snd_soc_dai_get_drvdata(cpu_dai);
- snd_soc_dai_set_dma_data(cpu_dai, substream, &saif->dma_param);
/* clear error status to 0 for each re-open */
saif->fifo_underrun = 0;
@@ -605,6 +604,8 @@ static int mxs_saif_dai_probe(struct snd_soc_dai *dai)
struct mxs_saif *saif = dev_get_drvdata(dai->dev);
snd_soc_dai_set_drvdata(dai, saif);
+ dai->playback_dma_data = &saif->dma_param;
+ dai->capture_dma_data = &saif->dma_param;
return 0;
}
OpenPOWER on IntegriCloud