Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9de36f2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 18e352e4 ef390c0b

sound/soc/codecs/wm8753.c

+8 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,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)

sound/soc/omap/omap-mcbsp.c

+4 −0
Original line number Diff line number Diff line
@@ -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: