diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-29 08:57:59 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-29 08:57:59 -0500 |
| commit | 0bf5460de96aa66abf9350333ee6711e73b3b31e (patch) | |
| tree | 4619f73139984d53bf16372d315e86fe0dfef017 /sound/soc/omap | |
| parent | 67fcdead3c7424d51e7108c220c9ab1a5e752ed3 (diff) | |
| parent | ef390c0b6e3f4d2d2d43f53f4bd35e1884571a14 (diff) | |
Merge branch 'for-2.6.29' into for-2.6.30
Diffstat (limited to 'sound/soc/omap')
| -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: |