Merge tag 'livepatching-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / pwm / pwm-samsung.c

diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c
index 0a4ff55..9c5b4f5 100644 (file)
--- a/drivers/pwm/pwm-samsung.c
+++ b/drivers/pwm/pwm-samsung.c
@@ -321,14 +321,6 @@ static int __pwm_samsung_config(struct pwm_chip *chip, struct pwm_device *pwm,
        struct samsung_pwm_channel *chan = pwm_get_chip_data(pwm);
        u32 tin_ns = chan->tin_ns, tcnt, tcmp, oldtcmp;
 
-       /*
-        * We currently avoid using 64bit arithmetic by using the
-        * fact that anything faster than 1Hz is easily representable
-        * by 32bits.
-        */
-       if (period_ns > NSEC_PER_SEC)
-               return -ERANGE;
-
        tcnt = readl(our_chip->base + REG_TCNTB(pwm->hwpwm));
        oldtcmp = readl(our_chip->base + REG_TCMPB(pwm->hwpwm));
 
@@ -438,13 +430,51 @@ static int pwm_samsung_set_polarity(struct pwm_chip *chip,
        return 0;
 }
 
+static int pwm_samsung_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+                            const struct pwm_state *state)
+{
+       int err, enabled = pwm->state.enabled;
+
+       if (state->polarity != pwm->state.polarity) {
+               if (enabled) {
+                       pwm_samsung_disable(chip, pwm);
+                       enabled = false;
+               }
+
+               err = pwm_samsung_set_polarity(chip, pwm, state->polarity);
+               if (err)
+                       return err;
+       }
+
+       if (!state->enabled) {
+               if (enabled)
+                       pwm_samsung_disable(chip, pwm);
+
+               return 0;
+       }
+
+       /*
+        * We currently avoid using 64bit arithmetic by using the
+        * fact that anything faster than 1Hz is easily representable
+        * by 32bits.
+        */
+       if (state->period > NSEC_PER_SEC)
+               return -ERANGE;
+
+       err = pwm_samsung_config(chip, pwm, state->duty_cycle, state->period);
+       if (err)
+               return err;
+
+       if (!pwm->state.enabled)
+               err = pwm_samsung_enable(chip, pwm);
+
+       return err;
+}
+
 static const struct pwm_ops pwm_samsung_ops = {
        .request        = pwm_samsung_request,
        .free           = pwm_samsung_free,
-       .enable         = pwm_samsung_enable,
-       .disable        = pwm_samsung_disable,
-       .config         = pwm_samsung_config,
-       .set_polarity   = pwm_samsung_set_polarity,
+       .apply          = pwm_samsung_apply,
        .owner          = THIS_MODULE,
 };