Commit f515c383 authored Oct 24, 2016 by Bard Liao Committed by Mark Brown Oct 24, 2016

ASoC: rt298: fix jack type detect error



rt298_jack_detect may be called before card is instantiated. And
snd_soc_dapm_force_enable_pin will not work in that case. So, update
bit manually by regmap_update_bits.

Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 1001354c

sound/soc/codecs/rt298.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,11 @@ static int rt298_jack_detect(struct rt298_priv rt298, bool hp, bool *mic)
		snd_soc_dapm_force_enable_pin(dapm, "LDO1");
		snd_soc_dapm_sync(dapm);

		regmap_update_bits(rt298->regmap,
		RT298_POWER_CTRL1, 0x1001, 0);
		regmap_update_bits(rt298->regmap,
		RT298_POWER_CTRL2, 0x4, 0x4);

		regmap_write(rt298->regmap, RT298_SET_MIC1, 0x24);
		msleep(50);