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

Commit c721bbda authored by Eero Nurkkala's avatar Eero Nurkkala Committed by Mark Brown
Browse files

ASoC: Add runtime check for RFIG and XFIG 



This is, no RFIG or XFIG (Not defined in 34xx), correct
initiliazation of rccr and xccr.

Signed-off-by: default avatarEero Nurkkala <ext-eero.nurkkala@nokia.com>
Acked-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a152ff24

sound/soc/omap/omap-mcbsp.c

+5 −2
Original line number Diff line number Diff line
@@ -321,8 +321,11 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
	/* Generic McBSP register settings */

	regs->spcr2	|= XINTM(3) | FREE;

	regs->spcr1	|= RINTM(3);

	/* RFIG and XFIG are not defined in 34xx */

	if (!cpu_is_omap34xx()) {

		regs->rcr2	|= RFIG;

		regs->xcr2	|= XFIG;

	}

	if (cpu_is_omap2430() || cpu_is_omap34xx()) {

		regs->xccr = DXENDLY(1) | XDMAEN;

		regs->rccr = RFULL_CYCLE | RDMAEN;