aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-mcbsp.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-11 06:17:14 -0400
committerMark Brown <broonie@linaro.org>2013-09-11 06:17:14 -0400
commit29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch)
tree51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/omap/omap-mcbsp.c
parent6e4664525b1db28f8c4e1130957f70a94c19213e (diff)
parente011143454606de70eba1db5d99454eec0017fdb (diff)
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.c5
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,
433 /* Sample rate generator drives the FS */ 433 /* Sample rate generator drives the FS */
434 regs->srgr2 |= FSGM; 434 regs->srgr2 |= FSGM;
435 break; 435 break;
436 case SND_SOC_DAIFMT_CBM_CFS:
437 /* McBSP slave. FS clock as output */
438 regs->srgr2 |= FSGM;
439 regs->pcr0 |= FSXM;
440 break;
436 case SND_SOC_DAIFMT_CBM_CFM: 441 case SND_SOC_DAIFMT_CBM_CFM:
437 /* McBSP slave */ 442 /* McBSP slave */
438 break; 443 break;