diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-29 14:47:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-29 14:47:53 +0100 |
| commit | c9de36f2a230919bee95f05ba27ed10ce4850409 (patch) | |
| tree | 638feea930da60827ad3c6d7c321b0aa38adc399 /sound/soc/omap/omap-mcbsp.c | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | ef390c0b6e3f4d2d2d43f53f4bd35e1884571a14 (diff) | |
| download | linux-rt-c9de36f2a230919bee95f05ba27ed10ce4850409.tar.gz | |
Merge branch 'fix/asoc' into for-linus
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, regs->spcr1 |= RINTM(3); regs->rcr2 |= RFIG; regs->xcr2 |= XFIG; + if (cpu_is_omap2430() || cpu_is_omap34xx()) { + regs->xccr = DXENDLY(1) | XDMAEN; + regs->rccr = RFULL_CYCLE | RDMAEN; + } switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: |