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

Commit da6320be authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Takashi Iwai
Browse files

ALSA: ASoC: OMAP: Continue fixing DSP DAI format in McBSP DAI driver 



Fix "ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver" was not correct
due misunderstanding of DSP_A format and similar error in TLV320AIC33
codec which was used to test the original fix.

This patch corrects now DSP_A format in OMAP McBSP DAI driver and is
verified with TLV320AIC23 codec that's implementing DSP_A correctly.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@nokia.com>
Cc: Arun KS <arunks@mistralsolutions.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ba9d0fd0

sound/soc/omap/omap-mcbsp.c

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

	case SND_SOC_DAIFMT_DSP_A:

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

		regs->srgr1	|= FWID(0);

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

		break;

	}
@@ -284,7 +284,6 @@ 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;
@@ -307,8 +306,6 @@ 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 bit clock and FS polarity configuration for DSP_A */

		temp_fmt ^= SND_SOC_DAIFMT_IB_IF;

		break;

	default:

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



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

	switch (temp_fmt & SND_SOC_DAIFMT_INV_MASK) {

	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

	case SND_SOC_DAIFMT_NB_NF:

		/*

		 * Normal BCLK + FS.