From 01bba47f7ac3d86040b5975ccd958fca9a48108a Mon Sep 17 00:00:00 2001 From: Eero Nurkkala Date: Thu, 20 Aug 2009 16:18:23 +0300 Subject: [PATCH] --- yaml --- r: 157697 b: refs/heads/master c: c721bbdad71d2928e8b5015e9b462fbeb35427c6 h: refs/heads/master i: 157695: 667ba87764631997cf36a041fdaa5a1e01f629ff v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/omap-mcbsp.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 60da2aae40d4..d647399739b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a152ff24b9784ddfd347953f23c53f0b890ebca8 +refs/heads/master: c721bbdad71d2928e8b5015e9b462fbeb35427c6 diff --git a/trunk/sound/soc/omap/omap-mcbsp.c b/trunk/sound/soc/omap/omap-mcbsp.c index 6a837ffd5d0b..a7b09614734d 100644 --- a/trunk/sound/soc/omap/omap-mcbsp.c +++ b/trunk/sound/soc/omap/omap-mcbsp.c @@ -321,8 +321,11 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, /* Generic McBSP register settings */ regs->spcr2 |= XINTM(3) | FREE; regs->spcr1 |= RINTM(3); - regs->rcr2 |= RFIG; - regs->xcr2 |= XFIG; + /* RFIG and XFIG are not defined in 34xx */ + if (!cpu_is_omap34xx()) { + regs->rcr2 |= RFIG; + regs->xcr2 |= XFIG; + } if (cpu_is_omap2430() || cpu_is_omap34xx()) { regs->xccr = DXENDLY(1) | XDMAEN; regs->rccr = RFULL_CYCLE | RDMAEN;