summaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-17 21:18:40 +0100
committerMark Brown <broonie@linaro.org>2013-10-20 17:26:37 +0100
commit511e30331745e0c3452b89354a4b94c0e60f15a4 (patch)
tree218469978b45aea45c99f2ecd77356eeacf27f36 /sound/soc/samsung
parentecfc0c04f236f1e2a95094792ec10cf27be39f7c (diff)
downloadlinux-511e30331745e0c3452b89354a4b94c0e60f15a4.tar.gz
linux-511e30331745e0c3452b89354a4b94c0e60f15a4.tar.bz2
linux-511e30331745e0c3452b89354a4b94c0e60f15a4.zip
ASoC: samsung: Initialise DMA data at device probe time
This is a minor simplification and will help with converting the platform to use the dmaengine helpers. Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/i2s.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index b302f3b7a587..3e08b6c0f7ba 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -702,13 +702,6 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
}
writel(mod, i2s->addr + I2SMOD);
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
- snd_soc_dai_set_dma_data(dai, substream,
- (void *)&i2s->dma_playback);
- else
- snd_soc_dai_set_dma_data(dai, substream,
- (void *)&i2s->dma_capture);
-
i2s->frmclk = params_rate(params);
return 0;
@@ -970,6 +963,8 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
}
clk_prepare_enable(i2s->clk);
+ snd_soc_dai_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture);
+
if (other) {
other->addr = i2s->addr;
other->clk = i2s->clk;