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

Commit 9ee802ec authored by Filip Brozovic's avatar Filip Brozovic Committed by Mark Brown
Browse files

ASoC: sgtl5000: Use shift mask when setting codec mode 



Shift the I2S mode value by the necessary amount before writing the
registers. This makes Right Justified and PCM mode work in addition to
the default Left Justified mode.

Signed-off-by: default avatarFilip Brozovic <fbrozovic@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 97bf6af1

sound/soc/codecs/sgtl5000.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -483,21 +483,21 @@ static int sgtl5000_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
	/* setting i2s data format */

	/* setting i2s data format */

	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_DSP_A:

	case SND_SOC_DAIFMT_DSP_A:

		i2sctl |= SGTL5000_I2S_MODE_PCM;

		i2sctl |= SGTL5000_I2S_MODE_PCM << SGTL5000_I2S_MODE_SHIFT;

		break;

		break;

	case SND_SOC_DAIFMT_DSP_B:

	case SND_SOC_DAIFMT_DSP_B:

		i2sctl |= SGTL5000_I2S_MODE_PCM;

		i2sctl |= SGTL5000_I2S_MODE_PCM << SGTL5000_I2S_MODE_SHIFT;

		i2sctl |= SGTL5000_I2S_LRALIGN;

		i2sctl |= SGTL5000_I2S_LRALIGN;

		break;

		break;

	case SND_SOC_DAIFMT_I2S:

	case SND_SOC_DAIFMT_I2S:

		i2sctl |= SGTL5000_I2S_MODE_I2S_LJ;

		i2sctl |= SGTL5000_I2S_MODE_I2S_LJ << SGTL5000_I2S_MODE_SHIFT;

		break;

		break;

	case SND_SOC_DAIFMT_RIGHT_J:

	case SND_SOC_DAIFMT_RIGHT_J:

		i2sctl |= SGTL5000_I2S_MODE_RJ;

		i2sctl |= SGTL5000_I2S_MODE_RJ << SGTL5000_I2S_MODE_SHIFT;

		i2sctl |= SGTL5000_I2S_LRPOL;

		i2sctl |= SGTL5000_I2S_LRPOL;

		break;

		break;

	case SND_SOC_DAIFMT_LEFT_J:

	case SND_SOC_DAIFMT_LEFT_J:

		i2sctl |= SGTL5000_I2S_MODE_I2S_LJ;

		i2sctl |= SGTL5000_I2S_MODE_I2S_LJ << SGTL5000_I2S_MODE_SHIFT;

		i2sctl |= SGTL5000_I2S_LRALIGN;

		i2sctl |= SGTL5000_I2S_LRALIGN;

		break;

		break;

	default:

	default: