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

Commit 86139a13 authored by Jari Vanhala's avatar Jari Vanhala Committed by Mark Brown
Browse files

ASoC: TWL4030: Vibra motor stop fix when it is driven with audio 



This patch fixes vibrator playing incoherently, when driven
with audio. There is something wrong in switch 3 at
H-bridge and VIBRA_SET still affects PWM generator.
Slowest value fixes things.

Signed-off-by: default avatarJari Vanhala <ext-jari.vanhala@nokia.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7e1aa1dc

sound/soc/codecs/twl4030.c

+10 −2
Original line number Diff line number Diff line
@@ -613,6 +613,13 @@ static int handsfreerpga_event(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int vibramux_event(struct snd_soc_dapm_widget *w,

		struct snd_kcontrol *kcontrol, int event)

{

	twl4030_write(w->codec, TWL4030_REG_VIBRA_SET, 0xff);

	return 0;

}



static void headset_ramp(struct snd_soc_codec *codec, int ramp)

{

	struct snd_soc_device *socdev = codec->socdev;
@@ -1243,8 +1250,9 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { 
			0, 0, NULL, 0, handsfreerpga_event,

			SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),

	/* Vibra */

	SND_SOC_DAPM_MUX("Vibra Mux", TWL4030_REG_VIBRA_CTL, 0, 0,

		&twl4030_dapm_vibra_control),

	SND_SOC_DAPM_MUX_E("Vibra Mux", TWL4030_REG_VIBRA_CTL, 0, 0,

			   &twl4030_dapm_vibra_control, vibramux_event,

			   SND_SOC_DAPM_PRE_PMU),

	SND_SOC_DAPM_MUX("Vibra Route", SND_SOC_NOPM, 0, 0,

		&twl4030_dapm_vibrapath_control),