pwm: atmel: Improve duty cycle calculation in .apply()

In the calculation of the register value determining the duty cycle the
requested period is used instead of the actually implemented period which
results in suboptimal settings.

The following example assumes an input clock of 133333333 Hz on one of
the SoCs with 16 bit period.

When the following state is to be applied:

        .period = 414727681
        .duty_cycle = 652806

the following register values used to be  calculated:

        PRES = 10
        CPRD = 54000
        CDTY = 53916

which yields an actual duty cycle of a bit more than 645120 ns.

The setting

        PRES = 10
        CPRD = 54000
        CDTY = 53915

however yields a duty of 652800 ns which is between the current result
and the requested value and so is a better approximation.

The reason for this error is that for the calculation of CDTY the
requested period was used instead of the actually implemented one.

Signed-off-by: Uwe Kleine-König <[email protected]>
Signed-off-by: Thierry Reding <[email protected]>

diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c
index ebaeb50dcfde2ce260f29983c37be5c16bd9414c..29b5ad03f7150f1cc14ead6733e1872f65e7d865 100644 (file)
--- a/drivers/pwm/pwm-atmel.c
+++ b/drivers/pwm/pwm-atmel.c
@@ -124,6 +124,7 @@ static inline void atmel_pwm_ch_writel(struct atmel_pwm_chip *chip,
 }
 
 static int atmel_pwm_calculate_cprd_and_pres(struct pwm_chip *chip,
+                                            unsigned long clkrate,
                                             const struct pwm_state *state,
                                             unsigned long *cprd, u32 *pres)
 {
@@ -132,7 +133,7 @@ static int atmel_pwm_calculate_cprd_and_pres(struct pwm_chip *chip,
        int shift;
 
        /* Calculate the period cycles and prescale value */
-       cycles *= clk_get_rate(atmel_pwm->clk);
+       cycles *= clkrate;
        do_div(cycles, NSEC_PER_SEC);
 
        /*
@@ -158,12 +159,14 @@ static int atmel_pwm_calculate_cprd_and_pres(struct pwm_chip *chip,
 }
 
 static void atmel_pwm_calculate_cdty(const struct pwm_state *state,
-                                    unsigned long cprd, unsigned long *cdty)
+                                    unsigned long clkrate, unsigned long cprd,
+                                    u32 pres, unsigned long *cdty)
 {
        unsigned long long cycles = state->duty_cycle;
 
-       cycles *= cprd;
-       do_div(cycles, state->period);
+       cycles *= clkrate;
+       do_div(cycles, NSEC_PER_SEC);
+       cycles >>= pres;
        *cdty = cprd - cycles;
 }
 
@@ -244,17 +247,23 @@ static int atmel_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
        pwm_get_state(pwm, &cstate);
 
        if (state->enabled) {
+               unsigned long clkrate = clk_get_rate(atmel_pwm->clk);
+
                if (cstate.enabled &&
                    cstate.polarity == state->polarity &&
                    cstate.period == state->period) {
+                       u32 cmr = atmel_pwm_ch_readl(atmel_pwm, pwm->hwpwm, PWM_CMR);
+
                        cprd = atmel_pwm_ch_readl(atmel_pwm, pwm->hwpwm,
                                                  atmel_pwm->data->regs.period);
-                       atmel_pwm_calculate_cdty(state, cprd, &cdty);
+                       pres = cmr & PWM_CMR_CPRE_MSK;
+
+                       atmel_pwm_calculate_cdty(state, clkrate, cprd, pres, &cdty);
                        atmel_pwm_update_cdty(chip, pwm, cdty);
                        return 0;
                }
 
-               ret = atmel_pwm_calculate_cprd_and_pres(chip, state, &cprd,
+               ret = atmel_pwm_calculate_cprd_and_pres(chip, clkrate, state, &cprd,
                                                        &pres);
                if (ret) {
                        dev_err(chip->dev,
@@ -262,7 +271,7 @@ static int atmel_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
                        return ret;
                }
 
-               atmel_pwm_calculate_cdty(state, cprd, &cdty);
+               atmel_pwm_calculate_cdty(state, clkrate, cprd, pres, &cdty);
 
                if (cstate.enabled) {
                        atmel_pwm_disable(chip, pwm, false);