From 134de5709a164568b46bfb9a95c9f134065f6b75 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 27 May 2014 10:24:22 +0200 Subject: ASoC: fsl-ssi: Set framerate divider correctly for i2s master mode In i2s master mode the fsl_ssi driver depends on someone calling .set_tdm_slot correctly. In this mode though only a DC value of 2 is allowed, so set it in this case and no longer depend on .set_tdm_slot. Signed-off-by: Sascha Hauer Signed-off-by: Markus Pargmann Tested-By: Michael Grzeschik Signed-off-by: Mark Brown (cherry picked from commit b5dd91b3dcf937ce42583711fe4d679cacdbd2d0) --- sound/soc/fsl/fsl_ssi.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sound/soc/fsl/fsl_ssi.c') diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 4fb1af4ec109..3a7836358c58 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -710,6 +710,10 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private, switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBS_CFS: ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_MASTER; + write_ssi_mask(&ssi->stccr, CCSR_SSI_SxCCR_DC_MASK, + CCSR_SSI_SxCCR_DC(2)); + write_ssi_mask(&ssi->srccr, CCSR_SSI_SxCCR_DC_MASK, + CCSR_SSI_SxCCR_DC(2)); break; case SND_SOC_DAIFMT_CBM_CFM: ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_SLAVE; -- cgit v1.2.3