pwm: pxa: Implement .apply() callback

To eventually get rid of all legacy drivers convert this driver to the
modern world implementing .apply(). This just pushes down a slightly
optimized variant of how legacy drivers are handled in the core.

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-pxa.c b/drivers/pwm/pwm-pxa.c
index 238ec88..0bcaa58 100644 (file)
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -58,7 +58,7 @@ static inline struct pxa_pwm_chip *to_pxa_pwm_chip(struct pwm_chip *chip)
  * duty_ns   = 10^9 * (PRESCALE + 1) * DC / PWM_CLK_RATE
  */
 static int pxa_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
-                         int duty_ns, int period_ns)
+                         u64 duty_ns, u64 period_ns)
 {
        struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip);
        unsigned long long c;
@@ -84,7 +84,7 @@ static int pxa_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
        if (duty_ns == period_ns)
                dc = PWMDCR_FD;
        else
-               dc = (pv + 1) * duty_ns / period_ns;
+               dc = mul_u64_u64_div_u64(pv + 1, duty_ns, period_ns);
 
        /* NOTE: the clock to PWM has to be enabled first
         * before writing to the registers
@@ -115,10 +115,33 @@ static void pxa_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
        clk_disable_unprepare(pc->clk);
 }
 
+static int pxa_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+                        const struct pwm_state *state)
+{
+       int err;
+
+       if (state->polarity != PWM_POLARITY_NORMAL)
+               return -EINVAL;
+
+       if (!state->enabled) {
+               if (pwm->state.enabled)
+                       pxa_pwm_disable(chip, pwm);
+
+               return 0;
+       }
+
+       err = pxa_pwm_config(chip, pwm, state->duty_cycle, state->period);
+       if (err)
+               return err;
+
+       if (!pwm->state.enabled)
+               return pxa_pwm_enable(chip, pwm);
+
+       return 0;
+}
+
 static const struct pwm_ops pxa_pwm_ops = {
-       .config = pxa_pwm_config,
-       .enable = pxa_pwm_enable,
-       .disable = pxa_pwm_disable,
+       .apply = pxa_pwm_apply,
        .owner = THIS_MODULE,
 };