diff options
author | Axel Lin <axel.lin@ingics.com> | 2013-04-23 02:01:31 -0400 |
---|---|---|
committer | Thierry Reding <thierry.reding@avionic-design.de> | 2013-04-23 04:58:35 -0400 |
commit | 08ee77b5a5de27ad63c92262ebcb4efe0da93b58 (patch) | |
tree | 53a9b7ed0369ca015923b638457ceba14edce926 | |
parent | f1a8870aeb5baeb58f0613d1f1e1dca967127fbd (diff) |
pwm: lpc32xx: Properly set PWM_ENABLE bit in lpc32xx_pwm_[enable|disable]
According to the LPC32x0 User Manual [1]:
For both PWM1 and PWM2 Control Registers:
BIT 31:
This bit gates the PWM_CLK signal and enables the external output pin
to the PWM_PIN_STATE logical level.
0 = PWM disabled. (Default)
1 = PWM enabled
So in lpc32xx_pwm_enable(), we should set PWM_ENABLE bit.
In lpc32xx_pwm_disable(), we should just clear PWM_ENABLE bit rather than
write 0 to the register which will also clear PWMx_RELOADV and PWMx_DUTY bits.
[1] http://www.nxp.com/documents/user_manual/UM10326.pdf
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Tested-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
-rw-r--r-- | drivers/pwm/pwm-lpc32xx.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/pwm/pwm-lpc32xx.c b/drivers/pwm/pwm-lpc32xx.c index b55cc5c1d614..6b6272f61da5 100644 --- a/drivers/pwm/pwm-lpc32xx.c +++ b/drivers/pwm/pwm-lpc32xx.c | |||
@@ -77,15 +77,29 @@ static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, | |||
77 | static int lpc32xx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) | 77 | static int lpc32xx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) |
78 | { | 78 | { |
79 | struct lpc32xx_pwm_chip *lpc32xx = to_lpc32xx_pwm_chip(chip); | 79 | struct lpc32xx_pwm_chip *lpc32xx = to_lpc32xx_pwm_chip(chip); |
80 | u32 val; | ||
81 | int ret; | ||
82 | |||
83 | ret = clk_enable(lpc32xx->clk); | ||
84 | if (ret) | ||
85 | return ret; | ||
80 | 86 | ||
81 | return clk_enable(lpc32xx->clk); | 87 | val = readl(lpc32xx->base + (pwm->hwpwm << 2)); |
88 | val |= PWM_ENABLE; | ||
89 | writel(val, lpc32xx->base + (pwm->hwpwm << 2)); | ||
90 | |||
91 | return 0; | ||
82 | } | 92 | } |
83 | 93 | ||
84 | static void lpc32xx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) | 94 | static void lpc32xx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) |
85 | { | 95 | { |
86 | struct lpc32xx_pwm_chip *lpc32xx = to_lpc32xx_pwm_chip(chip); | 96 | struct lpc32xx_pwm_chip *lpc32xx = to_lpc32xx_pwm_chip(chip); |
97 | u32 val; | ||
98 | |||
99 | val = readl(lpc32xx->base + (pwm->hwpwm << 2)); | ||
100 | val &= ~PWM_ENABLE; | ||
101 | writel(val, lpc32xx->base + (pwm->hwpwm << 2)); | ||
87 | 102 | ||
88 | writel(0, lpc32xx->base + (pwm->hwpwm << 2)); | ||
89 | clk_disable(lpc32xx->clk); | 103 | clk_disable(lpc32xx->clk); |
90 | } | 104 | } |
91 | 105 | ||