diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-19 15:23:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-12 00:28:57 +0000 |
| commit | 3688569e8173e84cd95d98f158245e17bca4f593 (patch) | |
| tree | 7f163d739333a2249ef7155d17a7cc00fdea814d /sound/soc/samsung/i2s.c | |
| parent | beaec3aab661e450511b8d84f079e47a4145dfb7 (diff) | |
| download | linux-stable-3688569e8173e84cd95d98f158245e17bca4f593.tar.gz linux-stable-3688569e8173e84cd95d98f158245e17bca4f593.tar.bz2 linux-stable-3688569e8173e84cd95d98f158245e17bca4f593.zip | |
ASoC: samsung: Provide helper for DMA init
In preparation for using the dmaengine helpers in ASoC rather than the
dmaengine wrappers for the Samsung API wrap the configuration of dma_data.
The dmaengine code expects different data to that used by the legacy API.
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung/i2s.c')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index a5cbdb4f1655..eab0050d4579 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -946,8 +946,11 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) struct i2s_dai *i2s = to_info(dai); struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai; - if (other && other->clk) /* If this is probe on secondary */ + if (other && other->clk) { /* If this is probe on secondary */ + samsung_asoc_init_dma_data(dai, &other->sec_dai->dma_playback, + NULL); goto probe_exit; + } i2s->addr = ioremap(i2s->base, 0x100); if (i2s->addr == NULL) { @@ -963,7 +966,7 @@ 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); + samsung_asoc_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture); if (other) { other->addr = i2s->addr; |