dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'for-2.6.29' into for-2.6.30

This commit is contained in:
Mark Brown 2009-01-29 13:57:59 +00:00
parent 67fcdead3c ef390c0b6e
commit 0bf5460de9
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/codecs/wm8753.c
View File

@ -1436,7 +1436,14 @@ static const struct snd_soc_dai wm8753_all_dai[] = {
},
};
struct snd_soc_dai wm8753_dai[2];
struct snd_soc_dai wm8753_dai[] = {
{
.name = "WM8753 DAI 0",
},
{
.name = "WM8753 DAI 1",
},
};
EXPORT_SYMBOL_GPL(wm8753_dai);
static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode)

4
sound/soc/omap/omap-mcbsp.c
View File

@ -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: