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

Unverified Commit ebf08ae3 authored by Nicolin Chen's avatar Nicolin Chen Committed by Mark Brown
Browse files

ASoC: fsl_ssi: Keep ssi->i2s_net updated 



The hw_params() overwrites i2s_net settings for special cases like
mono-channel support, however, it doesn't update ssi->i2s_net as
set_dai_fmt() does.

This patch removes the local i2s_net variable and directly updates
ssi->i2s_net in the hw_params() so that the driver can simply look
up the ssi->i2s_net instead of reading the register.

Signed-off-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Tested-by: default avatarCaleb Crome <caleb@crome.org>
Tested-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1476105c

sound/soc/fsl/fsl_ssi.c

+6 −6
Original line number Diff line number Diff line
@@ -838,16 +838,16 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, 
	}



	if (!fsl_ssi_is_ac97(ssi)) {

		u8 i2s_net;

		/* Normal + Network mode to send 16-bit data in 32-bit frames */

		if (fsl_ssi_is_i2s_cbm_cfs(ssi) && sample_size == 16)

			i2s_net = SSI_SCR_I2S_MODE_NORMAL | SSI_SCR_NET;

		else

			i2s_net = ssi->i2s_net;

			ssi->i2s_net = SSI_SCR_I2S_MODE_NORMAL | SSI_SCR_NET;



		/* Use Normal mode to send mono data at 1st slot of 2 slots */

		if (channels == 1)

			ssi->i2s_net = SSI_SCR_I2S_MODE_NORMAL;



		regmap_update_bits(regs, REG_SSI_SCR,

				   SSI_SCR_I2S_NET_MASK,

				   channels == 1 ? 0 : i2s_net);

				   SSI_SCR_I2S_NET_MASK, ssi->i2s_net);

	}



	/* In synchronous mode, the SSI uses STCCR for capture */