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

Commit 4acfa36b authored by Adam Thomson's avatar Adam Thomson Committed by Mark Brown
Browse files

ASoC: da7219: Correct BCLK inversion for DSP DAI format mode 



By default the device latches data on the falling edge of the
BCLK in DSP mode, whereas the expectation for normal BCLK is to
latch on the rising edge. This updates the driver to invert the
BCLK configuration for DSP mode, to align with expected behaviour.

Signed-off-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent abd7c894

sound/soc/codecs/da7219.c

+37 −11
Original line number Original line Diff line number Diff line
@@ -1156,6 +1156,10 @@ static int da7219_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_I2S:

	case SND_SOC_DAIFMT_LEFT_J:

	case SND_SOC_DAIFMT_RIGHT_J:

		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

		case SND_SOC_DAIFMT_NB_NF:

		case SND_SOC_DAIFMT_NB_NF:

			break;

			break;
@@ -1172,6 +1176,28 @@ static int da7219_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
		default:

		default:

			return -EINVAL;

			return -EINVAL;

		}

		}

		break;

	case SND_SOC_DAIFMT_DSP_B:

		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

		case SND_SOC_DAIFMT_NB_NF:

			dai_clk_mode |= DA7219_DAI_CLK_POL_INV;

			break;

		case SND_SOC_DAIFMT_NB_IF:

			dai_clk_mode |= DA7219_DAI_WCLK_POL_INV |

					DA7219_DAI_CLK_POL_INV;

			break;

		case SND_SOC_DAIFMT_IB_NF:

			break;

		case SND_SOC_DAIFMT_IB_IF:

			dai_clk_mode |= DA7219_DAI_WCLK_POL_INV;

			break;

		default:

			return -EINVAL;

		}

		break;

	default:

		return -EINVAL;

	}





	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_I2S:

	case SND_SOC_DAIFMT_I2S: