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_device *pwm;
+       struct pwm_state state;
 
        /* request pwm device with the consumer name */
        if (!lp->pwm) {
 
                lp->pwm = pwm;
 
-               /*
-                * FIXME: pwm_apply_args() should be removed when switching to
-                * the atomic PWM API.
-                */
-               pwm_apply_args(pwm);
+               pwm_init_state(lp->pwm, &state);
+       } else {
+               pwm_get_state(lp->pwm, &state);
        }
 
-       pwm_config(lp->pwm, duty, period);
-       if (duty)
-               pwm_enable(lp->pwm);
-       else
-               pwm_disable(lp->pwm);
+       state.period = lp->pdata->period_ns;
+       state.duty_cycle = div_u64(br * state.period, max_br);
+       state.enabled = state.duty_cycle;
+
+       pwm_apply_state(lp->pwm, &state);
 }
 
 static int lp855x_bl_update_status(struct backlight_device *bl)