From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 11 Jan 2010 16:56:19 +0000 (+0000)
Subject: ASoC: i.MX SSI driver does not yet support master mode
X-Git-Tag: v2.6.34-rc1~243^2^2~73^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d08a68bfca5a6464eb9167be0659bf0676f02555;p=karo-tx-linux.git

ASoC: i.MX SSI driver does not yet support master mode

The clocks for the SSI block need handling before this can work.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index ccb7ec9ce997..56f46a75d297 100644
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -133,15 +133,11 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 
 	/* DAI clock master masks */
 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-	case SND_SOC_DAIFMT_CBS_CFS:
-		strcr |= SSI_STCR_TFDIR | SSI_STCR_TXDIR;
-		break;
-	case SND_SOC_DAIFMT_CBM_CFS:
-		strcr |= SSI_STCR_TFDIR;
-		break;
-	case SND_SOC_DAIFMT_CBS_CFM:
-		strcr |= SSI_STCR_TXDIR;
+	case SND_SOC_DAIFMT_CBM_CFM:
 		break;
+	default:
+		/* Master mode not implemented, needs handling of clocks. */
+		return -EINVAL;
 	}
 
 	strcr |= SSI_STCR_TFEN0;