pwm: mediatek: add longer period support
Subsystems (2)
v2 cover pwm: mediatek: add longer period support
This patch add support for longer pwm period configuration, which allowing blinking LEDs via pwm interface.
Sam Shih (1):
pwm: mediatek: add longer period support
drivers/pwm/pwm-mediatek.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/1 pwm: mediatek: add longer period support
The pwm clock source could be divided by 1625 with PWM_CON BIT(3) setting in mediatek hardware.
This patch add support for longer pwm period configuration, which allowing blinking LEDs via pwm interface.
--- drivers/pwm/pwm-mediatek.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)
drivers/pwm/pwm-mediatek.c +30 -4
@@ -121,8 +121,11 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, int duty_ns, int period_ns) {struct pwm_mediatek_chip *pc =to_pwm_mediatek_chip (chip); -u32 clkdiv =0 , cnt_period, cnt_duty, reg_width =PWMDWIDTH , - reg_thres =PWMTHRES ; +/* The source clock is divided by 2^clkdiv or iff the clksel bit +* is set by (2^clkdiv*1625) +*/ +u32 clkdiv =0 , clksel =0 , cnt_period, cnt_duty, + reg_width =PWMDWIDTH , reg_thres =PWMTHRES ;u64 resolution;int ret;
@@ -133,12 +136,30 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm,/* Using resolution in picosecond gets accuracy higher */ resolution = (u64 )NSEC_PER_SEC *1000 ; +/* Calculate resolution based on current clock frequency */ do_div (resolution,clk_get_rate (pc->clk_pwms[pwm->hwpwm])); - +/* Using resolution to calculate cnt_period which represents +* the effective range of the PWM period counter +*/ cnt_period =DIV_ROUND_CLOSEST_ULL ((u64 )period_ns *1000 , resolution);while (cnt_period >8191 ) { +/* Using clkdiv to reduce clock frequency and calculate +* new resolution based on new clock speed +*/ resolution *=2 ; clkdiv++; +if (clkdiv >PWM_CLK_DIV_MAX && !clksel) { +/* Using clksel to divide the pwm source clock by +* an additional 1625, and recalculate new clkdiv +* and resolution +*/ + clksel =1 ; + clkdiv =0 ; + resolution = (u64 )NSEC_PER_SEC *1000 *1625 ; +do_div (resolution, +clk_get_rate (pc->clk_pwms[pwm->hwpwm])); + } +/* Calculate cnt_period based on resolution */ cnt_period =DIV_ROUND_CLOSEST_ULL ((u64 )period_ns *1000 , resolution); }
@@ -158,8 +179,13 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, reg_thres =PWM45THRES_FIXUP ; } +/* Calculate cnt_duty based on resolution */ cnt_duty =DIV_ROUND_CLOSEST_ULL ((u64 )duty_ns *1000 , resolution); -pwm_mediatek_writel (pc, pwm->hwpwm,PWMCON ,BIT (15 ) | clkdiv); +if (clksel) +pwm_mediatek_writel (pc, pwm->hwpwm,PWMCON ,BIT (15 ) |BIT (3 ) | + clkdiv); +else +pwm_mediatek_writel (pc, pwm->hwpwm,PWMCON ,BIT (15 ) | clkdiv);pwm_mediatek_writel (pc, pwm->hwpwm, reg_width, cnt_period);pwm_mediatek_writel (pc, pwm->hwpwm, reg_thres, cnt_duty);
Signature · 1 line
2.17.1
Quoted 16 lines · Sam Shih
The pwm clock source could be divided by 1625 with
PWM_CONBIT(3) setting in mediatek hardware.This patch add support for longer pwm period configuration, which allowing blinking LEDs via pwm interface.
Signed-off-by Sam Shih <[email protected]>--- drivers/pwm/pwm-mediatek.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)drivers/pwm/pwm-mediatek.c +0
-0
drivers/pwm/pwm-mediatek.c static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, · line 126
Quoted 8 lines
drivers/pwm/pwm-mediatek.c +3
-2@@ -121,8 +121,11 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, int duty_ns, int period_ns) {struct pwm_mediatek_chip *pc =to_pwm_mediatek_chip (chip); -u32 clkdiv =0 , cnt_period, cnt_duty, reg_width =PWMDWIDTH , - reg_thres =PWMTHRES ; +/* The source clock is divided by 2^clkdiv or iff the clksel bit +* is set by (2^clkdiv*1625) +*/
Please put the /* on it's own line. See
https://www.kernel.org/doc/html/latest/process/coding-style.html#commenting
Quoted 6 lines
drivers/pwm/pwm-mediatek.c +2
-0+u32 clkdiv =0 , clksel =0 , cnt_period, cnt_duty, + reg_width =PWMDWIDTH , reg_thres =PWMTHRES ;u64 resolution;int ret;
drivers/pwm/pwm-mediatek.c static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, · line 144
Quoted 10 lines
drivers/pwm/pwm-mediatek.c +4
-1@@ -133,12 +136,30 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm,/* Using resolution in picosecond gets accuracy higher */ resolution = (u64 )NSEC_PER_SEC *1000 ; +/* Calculate resolution based on current clock frequency */ do_div (resolution,clk_get_rate (pc->clk_pwms[pwm->hwpwm])); - +/* Using resolution to calculate cnt_period which represents +* the effective range of the PWM period counter +*/ cnt_period =DIV_ROUND_CLOSEST_ULL ((u64 )period_ns *1000 , resolution);
The existing code is rather bad. A better approach to calulate cnt_period (with a single division and higher accuracy):
cnt_period = DIV_ROUND_CLOSEST_ULL((u64)period_ns * clk_get_rate(..), NSEC_PER_SEC);
Quoted 22 lines
drivers/pwm/pwm-mediatek.c +15
-0while (cnt_period >8191 ) { +/* Using clkdiv to reduce clock frequency and calculate +* new resolution based on new clock speed +*/ resolution *=2 ; clkdiv++; +if (clkdiv >PWM_CLK_DIV_MAX && !clksel) { +/* Using clksel to divide the pwm source clock by +* an additional 1625, and recalculate new clkdiv +* and resolution +*/ + clksel =1 ; + clkdiv =0 ; + resolution = (u64 )NSEC_PER_SEC *1000 *1625 ; +do_div (resolution, +clk_get_rate (pc->clk_pwms[pwm->hwpwm])); + } +/* Calculate cnt_period based on resolution */ cnt_period =DIV_ROUND_CLOSEST_ULL ((u64 )period_ns *1000 , resolution); }
drivers/pwm/pwm-mediatek.c static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, · line 183
Quoted 5 lines
drivers/pwm/pwm-mediatek.c +1
-0@@ -158,8 +179,13 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, reg_thres =PWM45THRES_FIXUP ; } +/* Calculate cnt_duty based on resolution */ cnt_duty =DIV_ROUND_CLOSEST_ULL ((u64 )duty_ns *1000 , resolution);
Using resolution as divisor is bad here, too, so the way to calculate cnt_duty should be changed accordingly.
I think if the driver is simplified first, maybe even getting rid of the while loop, your change will get considerably easier, too.
drivers/pwm/pwm-mediatek.c static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, · line 190
Quoted 8 lines
drivers/pwm/pwm-mediatek.c +5
-1-pwm_mediatek_writel (pc, pwm->hwpwm,PWMCON ,BIT (15 ) | clkdiv); +if (clksel) +pwm_mediatek_writel (pc, pwm->hwpwm,PWMCON ,BIT (15 ) |BIT (3 ) | + clkdiv); +else +pwm_mediatek_writel (pc, pwm->hwpwm,PWMCON ,BIT (15 ) | clkdiv);pwm_mediatek_writel (pc, pwm->hwpwm, reg_width, cnt_period);pwm_mediatek_writel (pc, pwm->hwpwm, reg_thres, cnt_duty);
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Matthias Brugger
maintainerQuoted 5 lines · Sam Shih
The pwm clock source could be divided by 1625 with
PWM_CONBIT(3) setting in mediatek hardware.This patch add support for longer pwm period configuration, which allowing blinking LEDs via pwm interface.
Is this a fix? In this case please provide a Fixes tag with the commit ID which introduced the bug.
Thanks
Matthias
Quoted 72 lines
Signed-off-by Sam Shih <[email protected]>--- drivers/pwm/pwm-mediatek.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)drivers/pwm/pwm-mediatek.c +30
-4@@ -121,8 +121,11 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, int duty_ns, int period_ns) {struct pwm_mediatek_chip *pc =to_pwm_mediatek_chip (chip); -u32 clkdiv =0 , cnt_period, cnt_duty, reg_width =PWMDWIDTH , - reg_thres =PWMTHRES ; +/* The source clock is divided by 2^clkdiv or iff the clksel bit +* is set by (2^clkdiv*1625) +*/ +u32 clkdiv =0 , clksel =0 , cnt_period, cnt_duty, + reg_width =PWMDWIDTH , reg_thres =PWMTHRES ;u64 resolution;int ret;@@ -133,12 +136,30 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm,/* Using resolution in picosecond gets accuracy higher */ resolution = (u64 )NSEC_PER_SEC *1000 ; +/* Calculate resolution based on current clock frequency */ do_div (resolution,clk_get_rate (pc->clk_pwms[pwm->hwpwm])); - +/* Using resolution to calculate cnt_period which represents +* the effective range of the PWM period counter +*/ cnt_period =DIV_ROUND_CLOSEST_ULL ((u64 )period_ns *1000 , resolution);while (cnt_period >8191 ) { +/* Using clkdiv to reduce clock frequency and calculate +* new resolution based on new clock speed +*/ resolution *=2 ; clkdiv++; +if (clkdiv >PWM_CLK_DIV_MAX && !clksel) { +/* Using clksel to divide the pwm source clock by +* an additional 1625, and recalculate new clkdiv +* and resolution +*/ + clksel =1 ; + clkdiv =0 ; + resolution = (u64 )NSEC_PER_SEC *1000 *1625 ; +do_div (resolution, +clk_get_rate (pc->clk_pwms[pwm->hwpwm])); + } +/* Calculate cnt_period based on resolution */ cnt_period =DIV_ROUND_CLOSEST_ULL ((u64 )period_ns *1000 , resolution); }@@ -158,8 +179,13 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, reg_thres =PWM45THRES_FIXUP ; } +/* Calculate cnt_duty based on resolution */ cnt_duty =DIV_ROUND_CLOSEST_ULL ((u64 )duty_ns *1000 , resolution); -pwm_mediatek_writel (pc, pwm->hwpwm,PWMCON ,BIT (15 ) | clkdiv); +if (clksel) +pwm_mediatek_writel (pc, pwm->hwpwm,PWMCON ,BIT (15 ) |BIT (3 ) | + clkdiv); +else +pwm_mediatek_writel (pc, pwm->hwpwm,PWMCON ,BIT (15 ) | clkdiv);pwm_mediatek_writel (pc, pwm->hwpwm, reg_width, cnt_period);pwm_mediatek_writel (pc, pwm->hwpwm, reg_thres, cnt_duty);
Hello,
Quoted 9 lines · Matthias Brugger
Quoted 5 lines · Sam Shih
The pwm clock source could be divided by 1625 with
PWM_CONBIT(3) setting in mediatek hardware.This patch add support for longer pwm period configuration, which allowing blinking LEDs via pwm interface.
Is this a fix? In this case please provide a Fixes tag with the commit ID which introduced the bug.
I'd say it qualifies as a fix if without it a request with a long period returns success but isn't properly implemented. Otherwise it's only a new feature.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Hello,
Quoted 10 lines · Uwe Kleine-König
Hello,
Quoted 7 lines · Matthias Brugger
Quoted 5 lines · Sam Shih
The pwm clock source could be divided by 1625 with
PWM_CONBIT(3) setting in mediatek hardware.This patch add support for longer pwm period configuration, which allowing blinking LEDs via pwm interface.
Quoted 7 lines
Quoted 2 lines
Is this a fix? In this case please provide a Fixes tag with the commit ID which introduced the bug.
I'd say it qualifies as a fix if without it a request with a long period returns success but isn't properly implemented. Otherwise it's only a new feature.
It's only a new feature.
Without this patch, pwm_mediatek_config return -EINVAL when receive a long period request.
I will send v3 to reply Uwe's comment.
Best Regards,
Sam Shih