Merge branch 'for-2.6.29' into for-2.6.30
This commit is contained in:
commit
0bf5460de9
|
@ -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)
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue