gpio: mvebu: fix pwm .get_state period calculation
commit5.4-rM2-2.2.x-imx-squashede73b0101ae
upstream. The period is the sum of on and off values. That is, calculate period as ($on + $off) / clkrate instead of $off / clkrate - $on / clkrate that makes no sense. Reported-by: Russell King <linux@armlinux.org.uk> Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Fixes:757642f9a5
("gpio: mvebu: Add limited PWM support") Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> [baruch: backport to kernels <= v5.10] Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
131f8d8a88
commit
4afd772371
|
@ -657,9 +657,8 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
|
||||||
|
|
||||||
spin_lock_irqsave(&mvpwm->lock, flags);
|
spin_lock_irqsave(&mvpwm->lock, flags);
|
||||||
|
|
||||||
val = (unsigned long long)
|
u = readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));
|
||||||
readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));
|
val = (unsigned long long) u * NSEC_PER_SEC;
|
||||||
val *= NSEC_PER_SEC;
|
|
||||||
do_div(val, mvpwm->clk_rate);
|
do_div(val, mvpwm->clk_rate);
|
||||||
if (val > UINT_MAX)
|
if (val > UINT_MAX)
|
||||||
state->duty_cycle = UINT_MAX;
|
state->duty_cycle = UINT_MAX;
|
||||||
|
@ -668,21 +667,17 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
|
||||||
else
|
else
|
||||||
state->duty_cycle = 1;
|
state->duty_cycle = 1;
|
||||||
|
|
||||||
val = (unsigned long long)
|
val = (unsigned long long) u; /* on duration */
|
||||||
readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));
|
/* period = on + off duration */
|
||||||
|
val += readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));
|
||||||
val *= NSEC_PER_SEC;
|
val *= NSEC_PER_SEC;
|
||||||
do_div(val, mvpwm->clk_rate);
|
do_div(val, mvpwm->clk_rate);
|
||||||
if (val < state->duty_cycle) {
|
if (val > UINT_MAX)
|
||||||
|
state->period = UINT_MAX;
|
||||||
|
else if (val)
|
||||||
|
state->period = val;
|
||||||
|
else
|
||||||
state->period = 1;
|
state->period = 1;
|
||||||
} else {
|
|
||||||
val -= state->duty_cycle;
|
|
||||||
if (val > UINT_MAX)
|
|
||||||
state->period = UINT_MAX;
|
|
||||||
else if (val)
|
|
||||||
state->period = val;
|
|
||||||
else
|
|
||||||
state->period = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
regmap_read(mvchip->regs, GPIO_BLINK_EN_OFF + mvchip->offset, &u);
|
regmap_read(mvchip->regs, GPIO_BLINK_EN_OFF + mvchip->offset, &u);
|
||||||
if (u)
|
if (u)
|
||||||
|
|
Loading…
Reference in New Issue