Skip to content

L
linux-davinci
Commit 0bf5460d authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'for-2.6.29' into for-2.6.30

parents 67fcdead ef390c0b
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 1 deletion
sound/soc/codecs/wm8753.c
View file @ 0bf5460d
...@@ -1436,7 +1436,14 @@ static const struct snd_soc_dai wm8753_all_dai[] = { ...@@ -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); EXPORT_SYMBOL_GPL(wm8753_dai);
static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode) static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode)
......
sound/soc/omap/omap-mcbsp.c
View file @ 0bf5460d
...@@ -302,6 +302,10 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, ...@@ -302,6 +302,10 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
regs->spcr1 |= RINTM(3); regs->spcr1 |= RINTM(3);
regs->rcr2 |= RFIG; regs->rcr2 |= RFIG;
regs->xcr2 |= XFIG; 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) { switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S: case SND_SOC_DAIFMT_I2S:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment