[PATCH v5 41/46] backlight: lp855x: switch to the atomic PWM API
From: Boris Brezillon <hidden>
Date: 2016-03-30 20:06:05
Also in:
dri-devel, intel-gfx, linux-arm-kernel, linux-fbdev, linux-input, linux-leds, linux-pwm, linux-rockchip, linux-samsung-soc, lkml
Subsystem:
backlight class/subsystem, framebuffer layer, the rest · Maintainers:
Lee Jones, Daniel Thompson, Jingoo Han, Helge Deller, Linus Torvalds
pwm_config/enable/disable() have been deprecated and should be replaced by pwm_apply_state(). Signed-off-by: Boris Brezillon <redacted> --- drivers/video/backlight/lp855x_bl.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index daca9e6..5468e7a 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c@@ -235,8 +235,7 @@ err: static void lp855x_pwm_ctrl(struct lp855x *lp, int br, int max_br) { - unsigned int period = lp->pdata->period_ns; - unsigned int duty = br * period / max_br; + struct pwm_state pstate; struct pwm_device *pwm; /* request pwm device with the consumer name */
@@ -248,11 +247,15 @@ static void lp855x_pwm_ctrl(struct lp855x *lp, int br, int max_br) lp->pwm = pwm; } - pwm_config(lp->pwm, duty, period); - if (duty) - pwm_enable(lp->pwm); + pwm_get_state(lp->pwm, &pstate); + pstate.period = lp->pdata->period_ns; + pstate.duty_cycle = br * pstate.period / max_br; + if (pstate.duty_cycle) + pstate.enabled = true; else - pwm_disable(lp->pwm); + pstate.enabled = false; + + pwm_apply_state(lp->pwm, &pstate); } static int lp855x_bl_update_status(struct backlight_device *bl)
--
2.5.0