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

Commit 043b8daa authored by Marcus Cooper's avatar Marcus Cooper Committed by Mark Brown
Browse files

ASoC: sun4i-i2s: Update global enable with bitmask 



The default value of the config register is different on newer
SoCs and therefore enabling/disabling with a register write
will clear bits used to set the direction of the clock and frame
pins.

Signed-off-by: default avatarMarcus Cooper <codekipper@gmail.com>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d03d2737

sound/soc/sunxi/sun4i-i2s.c

+4 −3
Original line number Diff line number Diff line
@@ -529,8 +529,8 @@ static int sun4i_i2s_startup(struct snd_pcm_substream *substream, 
	struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);



	/* Enable the whole hardware block */

	regmap_write(i2s->regmap, SUN4I_I2S_CTRL_REG,

		     SUN4I_I2S_CTRL_GL_EN);

	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,

			   SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN);



	/* Enable the first output line */

	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
@@ -553,7 +553,8 @@ static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream, 
			   SUN4I_I2S_CTRL_SDO_EN_MASK, 0);



	/* Disable the whole hardware block */

	regmap_write(i2s->regmap, SUN4I_I2S_CTRL_REG, 0);

	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,

			   SUN4I_I2S_CTRL_GL_EN, 0);

}



static int sun4i_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id,