pwm: atmel-tcb: Implement .apply callback

This is just pushing down the core's compat code down into the driver using
the legacy callback nearly unchanged. The call to .enable() was just
dropped from .config() because .apply() calls it unconditionally.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>

diff --git a/drivers/pwm/pwm-atmel-tcb.c b/drivers/pwm/pwm-atmel-tcb.c
index ee70a61..4d2253f 100644 (file)
--- a/drivers/pwm/pwm-atmel-tcb.c
+++ b/drivers/pwm/pwm-atmel-tcb.c
@@ -362,20 +362,37 @@ static int atmel_tcb_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
        tcbpwm->div = i;
        tcbpwm->duty = duty;
 
-       /* If the PWM is enabled, call enable to apply the new conf */
-       if (pwm_is_enabled(pwm))
-               atmel_tcb_pwm_enable(chip, pwm);
-
        return 0;
 }
 
+static int atmel_tcb_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+                              const struct pwm_state *state)
+{
+       int duty_cycle, period;
+       int ret;
+
+       /* This function only sets a flag in driver data */
+       atmel_tcb_pwm_set_polarity(chip, pwm, state->polarity);
+
+       if (!state->enabled) {
+               atmel_tcb_pwm_disable(chip, pwm);
+               return 0;
+       }
+
+       period = state->period < INT_MAX ? state->period : INT_MAX;
+       duty_cycle = state->duty_cycle < INT_MAX ? state->duty_cycle : INT_MAX;
+
+       ret = atmel_tcb_pwm_config(chip, pwm, duty_cycle, period);
+       if (ret)
+               return ret;
+
+       return atmel_tcb_pwm_enable(chip, pwm);
+}
+
 static const struct pwm_ops atmel_tcb_pwm_ops = {
        .request = atmel_tcb_pwm_request,
        .free = atmel_tcb_pwm_free,
-       .config = atmel_tcb_pwm_config,
-       .set_polarity = atmel_tcb_pwm_set_polarity,
-       .enable = atmel_tcb_pwm_enable,
-       .disable = atmel_tcb_pwm_disable,
+       .apply = atmel_tcb_pwm_apply,
        .owner = THIS_MODULE,
 };