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>

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 6c2f040f49ae3c7282eed7a92662171703ad83e4..7864ec5cf5f93b7eb6d83dbc0ef10c840d4348a9 100644 (file)
--- 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;
 }