pwm: imx1: Implement .apply callback
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Thu, 18 Nov 2021 10:46:44 +0000 (11:46 +0100)
committerThierry Reding <thierry.reding@gmail.com>
Wed, 2 Feb 2022 16:05:19 +0000 (17:05 +0100)
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.

As a side effect this improves the behaviour for big duty cycles where
max * duty_ns overflowed before.

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

index bcd849496f8df6ba2573ab034ad9aac5c0974b6e..1f2eb1c8ff6c95c04c59a5e54596131a4ee0bff2 100644 (file)
@@ -61,7 +61,7 @@ static void pwm_imx1_clk_disable_unprepare(struct pwm_chip *chip)
 }
 
 static int pwm_imx1_config(struct pwm_chip *chip,
-                          struct pwm_device *pwm, int duty_ns, int period_ns)
+                          struct pwm_device *pwm, u64 duty_ns, u64 period_ns)
 {
        struct pwm_imx1_chip *imx = to_pwm_imx1_chip(chip);
        u32 max, p;
@@ -84,7 +84,7 @@ static int pwm_imx1_config(struct pwm_chip *chip,
         * (/2 .. /16).
         */
        max = readl(imx->mmio_base + MX1_PWMP);
-       p = max * duty_ns / period_ns;
+       p = mul_u64_u64_div_u64(max, duty_ns, period_ns);
 
        writel(max - p, imx->mmio_base + MX1_PWMS);
 
@@ -120,10 +120,33 @@ static void pwm_imx1_disable(struct pwm_chip *chip, struct pwm_device *pwm)
        pwm_imx1_clk_disable_unprepare(chip);
 }
 
+static int pwm_imx1_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)
+                       pwm_imx1_disable(chip, pwm);
+
+               return 0;
+       }
+
+       err = pwm_imx1_config(chip, pwm, state->duty_cycle, state->period);
+       if (err)
+               return err;
+
+       if (!pwm->state.enabled)
+               return pwm_imx1_enable(chip, pwm);
+
+       return 0;
+}
+
 static const struct pwm_ops pwm_imx1_ops = {
-       .enable = pwm_imx1_enable,
-       .disable = pwm_imx1_disable,
-       .config = pwm_imx1_config,
+       .apply = pwm_imx1_apply,
        .owner = THIS_MODULE,
 };