]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pwm: sti: Implement .apply() callback
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 6 May 2022 14:09:52 +0000 (16:09 +0200)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:18 +0000 (18:21 -0400)
[ Upstream commit b2e60b32b4fe5da4cf7fedd976416b5f47f62332 ]

To eventually get rid of all legacy drivers convert this driver to the
modern world implementing .apply().
This just pushed a variant of pwm_apply_legacy() into the driver that was
slightly simplified because the driver doesn't provide a .set_polarity()
callback.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Stable-dep-of: 5f623835584f ("pwm: sti: Fix capture for st,pwm-num-chan < st,capture-num-chan")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pwm/pwm-sti.c

index f8a3f30e54dd5e7fcefe1a8d3cac87df16369cfd..652fdb8dc7bfa868ca584ae76a499747ec75bc9c 100644 (file)
@@ -392,11 +392,34 @@ out:
        return ret;
 }
 
+static int sti_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)
+                       sti_pwm_disable(chip, pwm);
+
+               return 0;
+       }
+
+       err = sti_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       if (err)
+               return err;
+
+       if (!pwm->state.enabled)
+               err = sti_pwm_enable(chip, pwm);
+
+       return err;
+}
+
 static const struct pwm_ops sti_pwm_ops = {
        .capture = sti_pwm_capture,
-       .config = sti_pwm_config,
-       .enable = sti_pwm_enable,
-       .disable = sti_pwm_disable,
+       .apply = sti_pwm_apply,
        .free = sti_pwm_free,
        .owner = THIS_MODULE,
 };