aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-mcbsp.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
-rw-r--r--sound/soc/omap/omap-mcbsp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 6a837ffd5d0b..a7b09614734d 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -321,8 +321,11 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
321 /* Generic McBSP register settings */ 321 /* Generic McBSP register settings */
322 regs->spcr2 |= XINTM(3) | FREE; 322 regs->spcr2 |= XINTM(3) | FREE;
323 regs->spcr1 |= RINTM(3); 323 regs->spcr1 |= RINTM(3);
324 regs->rcr2 |= RFIG; 324 /* RFIG and XFIG are not defined in 34xx */
325 regs->xcr2 |= XFIG; 325 if (!cpu_is_omap34xx()) {
326 regs->rcr2 |= RFIG;
327 regs->xcr2 |= XFIG;
328 }
326 if (cpu_is_omap2430() || cpu_is_omap34xx()) { 329 if (cpu_is_omap2430() || cpu_is_omap34xx()) {
327 regs->xccr = DXENDLY(1) | XDMAEN; 330 regs->xccr = DXENDLY(1) | XDMAEN;
328 regs->rccr = RFULL_CYCLE | RDMAEN; 331 regs->rccr = RFULL_CYCLE | RDMAEN;