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

Commit 33cb92cf authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls 



Ensure all mask bits are clear before setting new value.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarDong Aisheng <b29396@freescale.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3205e662

sound/soc/codecs/sgtl5000.c

+6 −6
Original line number Diff line number Diff line
@@ -723,7 +723,9 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



	snd_soc_update_bits(codec, SGTL5000_CHIP_I2S_CTRL, i2s_ctl, i2s_ctl);

	snd_soc_update_bits(codec, SGTL5000_CHIP_I2S_CTRL,

			    SGTL5000_I2S_DLEN_MASK | SGTL5000_I2S_SCLKFREQ_MASK,

			    i2s_ctl);



	return 0;

}
@@ -1146,8 +1148,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) 
		vag = (vag - SGTL5000_ANA_GND_BASE) / SGTL5000_ANA_GND_STP;



	snd_soc_update_bits(codec, SGTL5000_CHIP_REF_CTRL,

			vag << SGTL5000_ANA_GND_SHIFT,

			vag << SGTL5000_ANA_GND_SHIFT);

			SGTL5000_ANA_GND_MASK, vag << SGTL5000_ANA_GND_SHIFT);



	/* set line out VAG to vddio / 2, in range (0.8v, 1.675v) */

	vag = vddio / 2;
@@ -1161,9 +1162,8 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) 
		    SGTL5000_LINE_OUT_GND_STP;



	snd_soc_update_bits(codec, SGTL5000_CHIP_LINE_OUT_CTRL,

			vag << SGTL5000_LINE_OUT_GND_SHIFT |

			SGTL5000_LINE_OUT_CURRENT_360u <<

				SGTL5000_LINE_OUT_CURRENT_SHIFT,

			SGTL5000_LINE_OUT_CURRENT_MASK |

			SGTL5000_LINE_OUT_GND_MASK,

			vag << SGTL5000_LINE_OUT_GND_SHIFT |

			SGTL5000_LINE_OUT_CURRENT_360u <<

				SGTL5000_LINE_OUT_CURRENT_SHIFT);