summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-11 17:56:19 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-17 12:10:02 +0100
commitd08a68bfca5a6464eb9167be0659bf0676f02555 (patch)
tree034f6d8be47f36fa391746e9b3dd216fb2a06efa /sound
parentASoC: Convert new i.MX SSI driver to use static DAI array (diff)
downloadlinux-d08a68bfca5a6464eb9167be0659bf0676f02555.tar.xz
linux-d08a68bfca5a6464eb9167be0659bf0676f02555.zip
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')
-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)
/* 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;