diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-23 14:38:11 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-23 14:38:11 +0200 |
| commit | d89ccac5a242a6547bcb8073f1ff65bdfa042266 (patch) | |
| tree | 7e0203a2af342ccb2638a8ccc8ab55948654955c /sound/soc/imx/imx-ssi.c | |
| parent | ASoC: Enable autoloading of pxa2xx CPU I2S driver with module alias (diff) | |
| parent | ASoC: i.MX ssi: use SSI_STCCR in synchronous mode (diff) | |
| download | linux-d89ccac5a242a6547bcb8073f1ff65bdfa042266.tar.xz linux-d89ccac5a242a6547bcb8073f1ff65bdfa042266.zip | |
Merge branch 'for-2.6.36' into for-2.6.37
Diffstat (limited to 'sound/soc/imx/imx-ssi.c')
| -rw-r--r-- | sound/soc/imx/imx-ssi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 2601be5a4ed8..26716e9626f4 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c @@ -254,6 +254,9 @@ static int imx_ssi_hw_params(struct snd_pcm_substream *substream, dma_data = &ssi->dma_params_rx; } + if (ssi->flags & IMX_SSI_SYN) + reg = SSI_STCCR; + snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data); sccr = readl(ssi->base + reg) & ~SSI_STCCR_WL_MASK; |