Merge tag 'amd-drm-next-6.5-2023-06-09' of https://gitlab.freedesktop.org/agd5f/linux...

[J-linux.git] / drivers / pwm / pwm-stmpe.c

diff --git a/drivers/pwm/pwm-stmpe.c b/drivers/pwm/pwm-stmpe.c
index c4336d3bace326f91b04124c681a9f3c85dc419b..5d4a4762ce0cdb1475bc345b19151d89e5a98756 100644 (file)
--- a/drivers/pwm/pwm-stmpe.c
+++ b/drivers/pwm/pwm-stmpe.c
@@ -259,10 +259,33 @@ static int stmpe_24xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
        return 0;
 }
 
+static int stmpe_24xx_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)
+                       stmpe_24xx_pwm_disable(chip, pwm);
+
+               return 0;
+       }
+
+       err = stmpe_24xx_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       if (err)
+               return err;
+
+       if (!pwm->state.enabled)
+               err = stmpe_24xx_pwm_enable(chip, pwm);
+
+       return err;
+}
+
 static const struct pwm_ops stmpe_24xx_pwm_ops = {
-       .config = stmpe_24xx_pwm_config,
-       .enable = stmpe_24xx_pwm_enable,
-       .disable = stmpe_24xx_pwm_disable,
+       .apply = stmpe_24xx_pwm_apply,
        .owner = THIS_MODULE,
 };