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

Commit 36ce8582 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver 



The DSP format wasn't still correct in OMAP McBSP DAI even after the commit
bd25867a.

Thanks to Peter Ujfalusi <peter.ujfalusi@nokia.com> for noticing and being
part of the fix. Now the FS length definition is more clear by defining
it with  FWID(0).

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 76fff368

sound/soc/omap/omap-mcbsp.c

+5 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, 
		break;

	case SND_SOC_DAIFMT_DSP_B:

		regs->srgr2	|= FPER(wlen * channels - 1);

		regs->srgr1	|= FWID(wlen * channels - 2);

		regs->srgr1	|= FWID(0);

		break;

	}
@@ -302,6 +302,7 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
{

	struct omap_mcbsp_data *mcbsp_data = to_mcbsp(cpu_dai->private_data);

	struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs;

	unsigned int temp_fmt = fmt;



	if (mcbsp_data->configured)

		return 0;
@@ -328,6 +329,8 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		/* 0-bit data delay */

		regs->rcr2      |= RDATDLY(0);

		regs->xcr2      |= XDATDLY(0);

		/* Invert FS polarity configuration */

		temp_fmt ^= SND_SOC_DAIFMT_NB_IF;

		break;

	default:

		/* Unsupported data format */
@@ -351,7 +354,7 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
	}



	/* Set bit clock (CLKX/CLKR) and FS polarities */

	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

	switch (temp_fmt & SND_SOC_DAIFMT_INV_MASK) {

	case SND_SOC_DAIFMT_NB_NF:

		/*

		 * Normal BCLK + FS.