summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Vogtländer <c.vogtlaender@sigma-surface-science.com>2019-03-12 10:08:46 +0100
committerThierry Reding <thierry.reding@gmail.com>2019-03-20 12:31:07 +0100
commitb00ef53053191d3025c15e8041699f8c9d132daf (patch)
tree27a2b114189ea811470238d45285a06063f66129
parentpwm: img: Turn final 'else if' into 'else' in img_pwm_config (diff)
downloadlinux-b00ef53053191d3025c15e8041699f8c9d132daf.tar.xz
linux-b00ef53053191d3025c15e8041699f8c9d132daf.zip
pwm: tiehrpwm: Update shadow register for disabling PWMs
It must be made sure that immediate mode is not already set, when modifying shadow register value in ehrpwm_pwm_disable(). Otherwise modifications to the action-qualifier continuous S/W force register(AQSFRC) will be done in the active register. This may happen when both channels are being disabled. In this case, only the first channel state will be recorded as disabled in the shadow register. Later, when enabling the first channel again, the second channel would be enabled as well. Setting RLDCSF to zero, first, ensures that the shadow register is updated as desired. Fixes: 38dabd91ff0b ("pwm: tiehrpwm: Fix disabling of output of PWMs") Signed-off-by: Christoph Vogtländer <c.vogtlaender@sigma-surface-science.com> [vigneshr@ti.com: Improve commit message] Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-rw-r--r--drivers/pwm/pwm-tiehrpwm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c
index f7b8a86fa5c5..ad4a40c0f27c 100644
--- a/drivers/pwm/pwm-tiehrpwm.c
+++ b/drivers/pwm/pwm-tiehrpwm.c
@@ -382,6 +382,8 @@ static void ehrpwm_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
}
/* Update shadow register first before modifying active register */
+ ehrpwm_modify(pc->mmio_base, AQSFRC, AQSFRC_RLDCSF_MASK,
+ AQSFRC_RLDCSF_ZRO);
ehrpwm_modify(pc->mmio_base, AQCSFRC, aqcsfrc_mask, aqcsfrc_val);
/*
* Changes to immediate action on Action Qualifier. This puts