pwm: lpc32xx: Properly set PWM_ENABLE bit in lpc32xx_pwm_[enable|disable]
Subsystems (2)
PATCH RESEND 1/2 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
---
Hi,
I don't have this hardware handy so I'd appreciate if someone can test this patch serial.
This patch serial was sent on https://lkml.org/lkml/2013/3/30/104
Seems no feedback so far.
So I just try again, maybe someone can help testing it. Thanks,
Axel
drivers/pwm/pwm-lpc32xx.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/pwm/pwm-lpc32xx.c +16 -2
@@ -77,15 +77,29 @@ static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,static int lpc32xx_pwm_enable (struct pwm_chip *chip,struct pwm_device *pwm) {struct lpc32xx_pwm_chip *lpc32xx =to_lpc32xx_pwm_chip (chip); +u32 val; +int ret; + + ret =clk_enable (lpc32xx->clk); +if (ret) +return ret; -return clk_enable (lpc32xx->clk); + val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val |=PWM_ENABLE ; +writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); + +return 0 ; }static void lpc32xx_pwm_disable (struct pwm_chip *chip,struct pwm_device *pwm) {struct lpc32xx_pwm_chip *lpc32xx =to_lpc32xx_pwm_chip (chip); +u32 val; + + val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val &= ~PWM_ENABLE ; +writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); -writel (0 , lpc32xx->base + (pwm->hwpwm <<2 ));clk_disable (lpc32xx->clk); }
Signature · 1 line
1.7.10.4
PATCH RESEND 2/2 pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config
lpc32xx_pwm_config() is supposed to set duty_ns and period_ns, it should not change PWM_ENABLE bit.
--- drivers/pwm/pwm-lpc32xx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pwm/pwm-lpc32xx.c +5 -2
@@ -37,6 +37,7 @@ static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,struct lpc32xx_pwm_chip *lpc32xx =to_lpc32xx_pwm_chip (chip);unsigned long long c;int period_cycles, duty_cycles; +u32 val; c =clk_get_rate (lpc32xx->clk) /256 ; c = c * period_ns;
@@ -68,8 +69,10 @@ static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, c =255 ; duty_cycles =256 - c; -writel (PWM_ENABLE |PWM_RELOADV (period_cycles) |PWM_DUTY (duty_cycles), - lpc32xx->base + (pwm->hwpwm <<2 )); + val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val &= ~0xFFFF ; + val |=PWM_RELOADV (period_cycles) |PWM_DUTY (duty_cycles); +writel (val, lpc32xx->base + (pwm->hwpwm <<2 ));return 0 ; }
Signature · 1 line
1.7.10.4
Re: [RESEND][PATCH RFT 2/2] pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config
Quoted 4 lines · Axel Lin
lpc32xx_pwm_config()is supposed to setduty_nsandperiod_ns, it should not changePWM_ENABLEbit.Signed-off-by Axel Lin <[email protected]>
Quoted 29 lines
--- drivers/pwm/pwm-lpc32xx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/pwm/pwm-lpc32xx.c +5
-2@@ -37,6 +37,7 @@ static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,struct lpc32xx_pwm_chip *lpc32xx =to_lpc32xx_pwm_chip (chip);unsigned long long c;int period_cycles, duty_cycles; +u32 val; c =clk_get_rate (lpc32xx->clk) /256 ; c = c * period_ns;@@ -68,8 +69,10 @@ static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, c =255 ; duty_cycles =256 - c; -writel (PWM_ENABLE |PWM_RELOADV (period_cycles) |PWM_DUTY (duty_cycles), - lpc32xx->base + (pwm->hwpwm <<2 )); + val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val &= ~0xFFFF ; + val |=PWM_RELOADV (period_cycles) |PWM_DUTY (duty_cycles); +writel (val, lpc32xx->base + (pwm->hwpwm <<2 ));return 0 ; }
Quoted 10 lines · Axel Lin
According to the LPC32x0 User Manual [1]:
For both PWM1 and PWM2 Control Registers:
BIT 31:
This bit gates thePWM_CLKsignal and enables the external output pin to thePWM_PIN_STATElogical level.0 = PWM disabled. (Default)
1 = PWM enabled
Quoted 7 lines
So in
lpc32xx_pwm_enable(), we should setPWM_ENABLEbit.
Inlpc32xx_pwm_disable(), we should just clearPWM_ENABLEbit rather than write 0 to the register which will also clearPWMx_RELOADVandPWMx_DUTYbits.[1] http://www.nxp.com/documents/user_manual/UM10326.pdf
Signed-off-by Axel Lin <[email protected]>
Quoted 50 lines
---
Hi,
I don't have this hardware handy so I'd appreciate if someone can test this patch serial.This patch serial was sent on https://lkml.org/lkml/2013/3/30/104
Seems no feedback so far.
So I just try again, maybe someone can help testing it. Thanks,
Axeldrivers/pwm/pwm-lpc32xx.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)drivers/pwm/pwm-lpc32xx.c +16
-2@@ -77,15 +77,29 @@ static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,static int lpc32xx_pwm_enable (struct pwm_chip *chip,struct pwm_device *pwm) {struct lpc32xx_pwm_chip *lpc32xx =to_lpc32xx_pwm_chip (chip); +u32 val; +int ret; + + ret =clk_enable (lpc32xx->clk); +if (ret) +return ret; -return clk_enable (lpc32xx->clk); + val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val |=PWM_ENABLE ; +writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); + +return 0 ; }static void lpc32xx_pwm_disable (struct pwm_chip *chip,struct pwm_device *pwm) {struct lpc32xx_pwm_chip *lpc32xx =to_lpc32xx_pwm_chip (chip); +u32 val; + + val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val &= ~PWM_ENABLE ; +writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); -writel (0 , lpc32xx->base + (pwm->hwpwm <<2 ));clk_disable (lpc32xx->clk); }
Quoted 22 lines · Axel Lin
According to the LPC32x0 User Manual [1]:
For both PWM1 and PWM2 Control Registers:
BIT 31:
This bit gates thePWM_CLKsignal and enables the external output pin to thePWM_PIN_STATElogical level.0 = PWM disabled. (Default)
1 = PWM enabledSo in
lpc32xx_pwm_enable(), we should setPWM_ENABLEbit.
Inlpc32xx_pwm_disable(), we should just clearPWM_ENABLEbit rather than write 0 to the register which will also clearPWMx_RELOADVandPWMx_DUTYbits.[1] http://www.nxp.com/documents/user_manual/UM10326.pdf
Signed-off-by Axel Lin <[email protected]>---
Hi,
I don't have this hardware handy so I'd appreciate if someone can test this patch serial.
Quoted 5 lines
This patch serial was sent on https://lkml.org/lkml/2013/3/30/104
Seems no feedback so far.
So I just try again, maybe someone can help testing it. Thanks,
Axel
Both patches applied with Roland's Tested-by. Thanks.
Thierry