pwm: sun4i: properly check current state
Subsystems (2)
PATCH 1/1 pwm: sun4i: properly check current state
Correctly extract the prescaler value from CTRL_REG before comparing it to PWM_PRESCAL_MASK.
Also, check that both PWM_CLK_GATING and PWM_EN to ensure the PWM is enabled instead of relying on only one of those.
--- drivers/pwm/pwm-sun4i.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pwm/pwm-sun4i.c +4 -2
@@ -117,7 +117,8 @@ static void sun4i_pwm_get_state(struct pwm_chip *chip, val =sun4i_pwm_readl (sun4i_pwm,PWM_CTRL_REG ); -if ((val ==PWM_PRESCAL_MASK ) && sun4i_pwm->data->has_prescaler_bypass) +if ((PWM_REG_PRESCAL (val, pwm->hwpwm) ==PWM_PRESCAL_MASK ) && + sun4i_pwm->data->has_prescaler_bypass) prescaler =1 ;else prescaler = prescaler_table[PWM_REG_PRESCAL (val, pwm->hwpwm)];
@@ -130,7 +131,8 @@ static void sun4i_pwm_get_state(struct pwm_chip *chip,else state->polarity =PWM_POLARITY_INVERSED ; -if (val &BIT_CH (PWM_CLK_GATING |PWM_EN , pwm->hwpwm)) +if ((val &BIT_CH (PWM_CLK_GATING |PWM_EN , pwm->hwpwm)) == +BIT_CH (PWM_CLK_GATING |PWM_EN , pwm->hwpwm)) state->enabled = true;else state->enabled = false;
Signature · 1 line
2.16.1
Thierry Reding
AppliedQuoted 11 lines · Alexandre Belloni
Correctly extract the prescaler value from
CTRL_REGbefore comparing it toPWM_PRESCAL_MASK.Also, check that both
PWM_CLK_GATINGandPWM_ENto ensure the PWM is enabled instead of relying on only one of those.Fixes 93e0dfb2c52f ("pwm: sun4i: Improve hardware read out")Signed-off-by Alexandre Belloni <[email protected]>--- drivers/pwm/pwm-sun4i.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Applied, thanks.
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180328/1ff93111/attachment.sig>