diff options
| author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-01-09 18:42:48 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-09 17:33:31 +0000 |
| commit | 2b56b5f02029531007c8601b23f282b840715401 (patch) | |
| tree | 122a069e4cff21d7e9dfb9d44ac922c529e0ec4d /sound/soc/fsl | |
| parent | e1cffe8c9f3a4f74b8b212c9fbe2873a8ee2f395 (diff) | |
| download | op-kernel-dev-2b56b5f02029531007c8601b23f282b840715401.zip op-kernel-dev-2b56b5f02029531007c8601b23f282b840715401.tar.gz | |
ASoC: fsl_ssi: Set default slot number for common cases
For those platforms using DAI master mode like I2S, it's better to pre-set
a default slot number so that there's no need for these common cases to set
the slot number from its machine driver any more.
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 6c2f040..7864ec5 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -711,6 +711,17 @@ static int fsl_ssi_setup(struct fsl_ssi_private *ssi_private) if (ssi_private->imx_ac97) fsl_ssi_setup_ac97(ssi_private); + /* + * Set a default slot number so that there is no need for those common + * cases like I2S mode to call the extra set_tdm_slot() any more. + */ + if (!ssi_private->imx_ac97) { + 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)); + } + return 0; } |
