ASoC: imx-ssi.c: add new choices to platform configuration

* introduce 3 new flags to allow a more detailed configuration
of the SSI link :
	IMX_SSI_NET : enable Network Mode
	IMX_SSI_SYN : enable Synchronous Mode
	IMX_SSI_USE_I2S_SLAVE : enable I2S Slave Mode
* new platform can use these settings without breaking actual
platforms.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index 80b4fee2442..50f51624c53 100644
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -83,8 +83,6 @@ static int imx_ssi_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai,
 /*
  * SSI DAI format configuration.
  * Should only be called when port is inactive (i.e. SSIEN = 0).
- * Note: We don't use the I2S modes but instead manually configure the
- * SSI for I2S because the I2S mode is only a register preset.
  */
 static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 {
@@ -99,6 +97,10 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
                 /* data on rising edge of bclk, frame low 1clk before data */
                 strcr |= SSI_STCR_TFSI | SSI_STCR_TEFS | SSI_STCR_TXBIT0;
                 scr |= SSI_SCR_NET;
+                if (ssi->flags & IMX_SSI_USE_I2S_SLAVE) {
+                        scr &= ~SSI_I2S_MODE_MASK;
+                        scr |= SSI_SCR_I2S_MODE_SLAVE;
+                }
                 break;
         case SND_SOC_DAIFMT_LEFT_J:
                 /* data on rising edge of bclk, frame high with data */
@@ -143,6 +145,11 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 
         strcr |= SSI_STCR_TFEN0;
 
+        if (ssi->flags & IMX_SSI_NET)
+                scr |= SSI_SCR_NET;
+        if (ssi->flags & IMX_SSI_SYN)
+                scr |= SSI_SCR_SYN;
+
         writel(strcr, ssi->base + SSI_STCR);
         writel(strcr, ssi->base + SSI_SRCR);
         writel(scr, ssi->base + SSI_SCR);