summaryrefslogtreecommitdiffstats
path: root/sound/soc/imx
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-23 13:38:11 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-23 13:38:11 +0100
commitd89ccac5a242a6547bcb8073f1ff65bdfa042266 (patch)
tree7e0203a2af342ccb2638a8ccc8ab55948654955c /sound/soc/imx
parent72fba57931c703ad71849b2521226c9bcb7d6688 (diff)
parent70bf043b137aa9ff2711b16532774465e07a8f47 (diff)
downloadop-kernel-dev-d89ccac5a242a6547bcb8073f1ff65bdfa042266.zip
op-kernel-dev-d89ccac5a242a6547bcb8073f1ff65bdfa042266.tar.gz
Merge branch 'for-2.6.36' into for-2.6.37
Diffstat (limited to 'sound/soc/imx')
-rw-r--r--sound/soc/imx/imx-ssi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index 2601be5..26716e9 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;
OpenPOWER on IntegriCloud