aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-11 11:56:19 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-17 06:10:02 -0500
commitd08a68bfca5a6464eb9167be0659bf0676f02555 (patch)
tree034f6d8be47f36fa391746e9b3dd216fb2a06efa /sound/soc
parent48dbc41988d07c7a9ba83afd31543d8ecb2beecc (diff)
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/imx/imx-ssi.c12
1 files changed, 4 insertions, 8 deletions
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)
133 133
134 /* DAI clock master masks */ 134 /* DAI clock master masks */
135 switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { 135 switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
136 case SND_SOC_DAIFMT_CBS_CFS: 136 case SND_SOC_DAIFMT_CBM_CFM:
137 strcr |= SSI_STCR_TFDIR | SSI_STCR_TXDIR;
138 break;
139 case SND_SOC_DAIFMT_CBM_CFS:
140 strcr |= SSI_STCR_TFDIR;
141 break;
142 case SND_SOC_DAIFMT_CBS_CFM:
143 strcr |= SSI_STCR_TXDIR;
144 break; 137 break;
138 default:
139 /* Master mode not implemented, needs handling of clocks. */
140 return -EINVAL;
145 } 141 }
146 142
147 strcr |= SSI_STCR_TFEN0; 143 strcr |= SSI_STCR_TFEN0;