diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
| commit | fb53fde9762432d091dac209bdf4f3f850117c55 (patch) | |
| tree | 607b09022b206a539cb4a924e4ef476443798252 /sound/soc/omap/omap-mcbsp.c | |
| parent | eb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index ec5e18a78758..05dd5abcddf4 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
| @@ -302,6 +302,10 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, | |||
| 302 | regs->spcr1 |= RINTM(3); | 302 | regs->spcr1 |= RINTM(3); |
| 303 | regs->rcr2 |= RFIG; | 303 | regs->rcr2 |= RFIG; |
| 304 | regs->xcr2 |= XFIG; | 304 | regs->xcr2 |= XFIG; |
| 305 | if (cpu_is_omap2430() || cpu_is_omap34xx()) { | ||
| 306 | regs->xccr = DXENDLY(1) | XDMAEN; | ||
| 307 | regs->rccr = RFULL_CYCLE | RDMAEN; | ||
| 308 | } | ||
| 305 | 309 | ||
| 306 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { | 310 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { |
| 307 | case SND_SOC_DAIFMT_I2S: | 311 | case SND_SOC_DAIFMT_I2S: |