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

Unverified Commit dcb407b2 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Mark Brown
Browse files

ASoC: tlv320aic31xx: Handle inverted BCLK in non-DSP modes 



Currently BCLK inverting is only handled when the DAI format is
DSP, but the BCLK may be inverted in any supported mode. Without
this using this CODEC in any other mode than DSP with the BCLK
inverted leads to bad sampling timing and very poor audio quality.

Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 77f8b3cf

sound/soc/codecs/tlv320aic31xx.c

+18 −10
Original line number Diff line number Diff line
@@ -938,23 +938,31 @@ static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		return -EINVAL;

	}



	/* interface format */

	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_I2S:

		break;

	case SND_SOC_DAIFMT_DSP_A:

		dsp_a_val = 0x1; /* fall through */

	case SND_SOC_DAIFMT_DSP_B:

		/* NOTE: BCLKINV bit value 1 equas NB and 0 equals IB */

	/* signal polarity */

	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

	case SND_SOC_DAIFMT_NB_NF:

			iface_reg2 |= AIC31XX_BCLKINV_MASK;

		break;

	case SND_SOC_DAIFMT_IB_NF:

		iface_reg2 |= AIC31XX_BCLKINV_MASK;

		break;

	default:

		dev_err(codec->dev, "Invalid DAI clock signal polarity\n");

		return -EINVAL;

	}



	/* interface format */

	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_I2S:

		break;

	case SND_SOC_DAIFMT_DSP_A:

		dsp_a_val = 0x1; /* fall through */

	case SND_SOC_DAIFMT_DSP_B:

		/*

		 * NOTE: This CODEC samples on the falling edge of BCLK in

		 * DSP mode, this is inverted compared to what most DAIs

		 * expect, so we invert for this mode

		 */

		iface_reg2 ^= AIC31XX_BCLKINV_MASK;

		iface_reg1 |= (AIC31XX_DSP_MODE <<

			       AIC31XX_IFACE1_DATATYPE_SHIFT);

		break;