diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:14 +0100 |
commit | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch) | |
tree | 51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/omap/omap-mcbsp.c | |
parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
parent | e011143454606de70eba1db5d99454eec0017fdb (diff) | |
download | talos-obmc-linux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.tar.gz talos-obmc-linux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.zip |
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 7483efb6dc67..6c19bba23570 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -433,6 +433,11 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, /* Sample rate generator drives the FS */ regs->srgr2 |= FSGM; break; + case SND_SOC_DAIFMT_CBM_CFS: + /* McBSP slave. FS clock as output */ + regs->srgr2 |= FSGM; + regs->pcr0 |= FSXM; + break; case SND_SOC_DAIFMT_CBM_CFM: /* McBSP slave */ break; |