diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-17 16:18:40 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-20 12:26:37 -0400 |
commit | 511e30331745e0c3452b89354a4b94c0e60f15a4 (patch) | |
tree | 218469978b45aea45c99f2ecd77356eeacf27f36 | |
parent | ecfc0c04f236f1e2a95094792ec10cf27be39f7c (diff) |
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>
-rw-r--r-- | sound/soc/samsung/i2s.c | 9 |
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, | |||
702 | } | 702 | } |
703 | writel(mod, i2s->addr + I2SMOD); | 703 | writel(mod, i2s->addr + I2SMOD); |
704 | 704 | ||
705 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
706 | snd_soc_dai_set_dma_data(dai, substream, | ||
707 | (void *)&i2s->dma_playback); | ||
708 | else | ||
709 | snd_soc_dai_set_dma_data(dai, substream, | ||
710 | (void *)&i2s->dma_capture); | ||
711 | |||
712 | i2s->frmclk = params_rate(params); | 705 | i2s->frmclk = params_rate(params); |
713 | 706 | ||
714 | return 0; | 707 | return 0; |
@@ -970,6 +963,8 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) | |||
970 | } | 963 | } |
971 | clk_prepare_enable(i2s->clk); | 964 | clk_prepare_enable(i2s->clk); |
972 | 965 | ||
966 | snd_soc_dai_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture); | ||
967 | |||
973 | if (other) { | 968 | if (other) { |
974 | other->addr = i2s->addr; | 969 | other->addr = i2s->addr; |
975 | other->clk = i2s->clk; | 970 | other->clk = i2s->clk; |