From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 6 Oct 2009 18:25:02 +0000 (+0100)
Subject: ASoC: Remove absent SYNC and TDM DAI format options from i.MX SSI
X-Git-Tag: v2.6.32-rc4~31^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b266002abf6dfa4b358fdb5495f09e350b296552;p=thirdparty%2Fkernel%2Flinux.git

ASoC: Remove absent SYNC and TDM DAI format options from i.MX SSI

These should be handled via set_tdm_slot() now and cause build
failures as-is.

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

diff --git a/sound/soc/imx/mxc-ssi.c b/sound/soc/imx/mxc-ssi.c
index 3806ff2c0cd42..ccdefe60e752f 100644
--- a/sound/soc/imx/mxc-ssi.c
+++ b/sound/soc/imx/mxc-ssi.c
@@ -397,14 +397,6 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai,
 		break;
 	}
 
-	/* sync */
-	if (!(fmt & SND_SOC_DAIFMT_ASYNC))
-		scr |= SSI_SCR_SYN;
-
-	/* tdm - only for stereo atm */
-	if (fmt & SND_SOC_DAIFMT_TDM)
-		scr |= SSI_SCR_NET;
-
 	if (cpu_dai->id == IMX_DAI_SSI0 || cpu_dai->id == IMX_DAI_SSI2) {
 		SSI1_STCR = stcr;
 		SSI1_SRCR = srcr;