summaryrefslogtreecommitdiffstats
path: root/drivers/pwm
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-04-09 17:21:26 +0800
committerThierry Reding <thierry.reding@gmail.com>2014-05-08 23:41:47 +0200
commit9c88669c2cfc91158f157b5584103ff7e5b6bedb (patch)
tree5b0180f1ab0c05808dbabc60dceaf4ab4e4215d9 /drivers/pwm
parent89c0339e0aa097384b3efed894b23820814c21d3 (diff)
downloadop-kernel-dev-9c88669c2cfc91158f157b5584103ff7e5b6bedb.zip
op-kernel-dev-9c88669c2cfc91158f157b5584103ff7e5b6bedb.tar.gz
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: Axel Lin <axel.lin@ingics.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
-rw-r--r--drivers/pwm/pwm-twl.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
index b99a50e..04f7672 100644
--- a/drivers/pwm/pwm-twl.c
+++ b/drivers/pwm/pwm-twl.c
@@ -265,14 +265,6 @@ static void twl6030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
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);
goto out;
}
OpenPOWER on IntegriCloud