Commit 7281cde1 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Greg Kroah-Hartman

pwm: clps711x: Fix period calculation

[ Upstream commit b0f17570 ]

Commit e39c0df1 ("pwm: Introduce the pwm_args concept") has
changed the variable for the period for clps711x-pwm driver, so now
pwm_get/set_period() works with pwm->state.period variable instead
of pwm->args.period.
This patch changes the period variable in other places where it is used.
Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e2e0a193
...@@ -48,7 +48,7 @@ static void clps711x_pwm_update_val(struct clps711x_chip *priv, u32 n, u32 v) ...@@ -48,7 +48,7 @@ static void clps711x_pwm_update_val(struct clps711x_chip *priv, u32 n, u32 v)
static unsigned int clps711x_get_duty(struct pwm_device *pwm, unsigned int v) static unsigned int clps711x_get_duty(struct pwm_device *pwm, unsigned int v)
{ {
/* Duty cycle 0..15 max */ /* Duty cycle 0..15 max */
return DIV_ROUND_CLOSEST(v * 0xf, pwm_get_period(pwm)); return DIV_ROUND_CLOSEST(v * 0xf, pwm->args.period);
} }
static int clps711x_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) static int clps711x_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
...@@ -71,7 +71,7 @@ static int clps711x_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, ...@@ -71,7 +71,7 @@ static int clps711x_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
struct clps711x_chip *priv = to_clps711x_chip(chip); struct clps711x_chip *priv = to_clps711x_chip(chip);
unsigned int duty; unsigned int duty;
if (period_ns != pwm_get_period(pwm)) if (period_ns != pwm->args.period)
return -EINVAL; return -EINVAL;
duty = clps711x_get_duty(pwm, duty_ns); duty = clps711x_get_duty(pwm, duty_ns);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment