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

Commit 9c88669c authored by Axel Lin's avatar Axel Lin Committed by Thierry Reding
Browse files

pwm: twl: Really disable twl6030 PWMs 



Current twl6030_pwm_disable() implementation writes TWL6030_TOGGLE3_REG
twice, the second write sets TWL6030_PWMXEN bits so the PWM clock does
not disable.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 89c0339e

drivers/pwm/pwm-twl.c

+0 −8
Original line number Diff line number Diff line
@@ -263,14 +263,6 @@ static void twl6030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) 
	val |= TWL6030_PWM_TOGGLE(pwm->hwpwm, TWL6030_PWMXR);

	val &= ~TWL6030_PWM_TOGGLE(pwm->hwpwm, TWL6030_PWMXS | TWL6030_PWMXEN);



	ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);

	if (ret < 0) {

		dev_err(chip->dev, "%s: Failed to read TOGGLE3\n", pwm->label);

		goto out;

	}



	val |= TWL6030_PWM_TOGGLE(pwm->hwpwm, TWL6030_PWMXS | TWL6030_PWMXEN);



	ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);

	if (ret < 0) {

		dev_err(chip->dev, "%s: Failed to disable PWM\n", pwm->label);