diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-08 10:45:09 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-08 10:45:09 +0100 |
commit | b727916a1f79f7a6e4603747b36a51777cb074e0 (patch) | |
tree | 58e9386a8b120a55678950d4465e85d05f1a9b34 /sound/soc/imx/mxc-ssi.c | |
parent | 907bc6c7fc7071b00083fc11e510e47dd93df45d (diff) | |
parent | 6f775ba0154cdf10108071acc71f26c4efdb8d57 (diff) |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/imx/mxc-ssi.c')
-rw-r--r-- | sound/soc/imx/mxc-ssi.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/imx/mxc-ssi.c b/sound/soc/imx/mxc-ssi.c index 3806ff2c0cd..ccdefe60e75 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; |