Commit 6ef213d6 authored by Clemens Gruber's avatar Clemens Gruber Committed by Greg Kroah-Hartman

pwm: pca9685: Fix period change with same duty cycle

commit 8d254a34 upstream.

When first implementing support for changing the output frequency, an
optimization was added to continue the PWM after changing the prescaler
without having to reprogram the ON and OFF registers for the duty cycle,
in case the duty cycle stayed the same. This was flawed, because we
compared the absolute value of the duty cycle in nanoseconds instead of
the ratio to the period.

Fix the problem by removing the shortcut.

Fixes: 01ec8472 ("pwm-pca9685: Support changing the output frequency")
Signed-off-by: default avatarClemens Gruber <clemens.gruber@pqgruber.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1c924e8
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
#define PCA9685_MAXCHAN 0x10 #define PCA9685_MAXCHAN 0x10
#define LED_FULL (1 << 4) #define LED_FULL (1 << 4)
#define MODE1_RESTART (1 << 7)
#define MODE1_SLEEP (1 << 4) #define MODE1_SLEEP (1 << 4)
#define MODE2_INVRT (1 << 4) #define MODE2_INVRT (1 << 4)
#define MODE2_OUTDRV (1 << 2) #define MODE2_OUTDRV (1 << 2)
...@@ -117,16 +116,6 @@ static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, ...@@ -117,16 +116,6 @@ static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
udelay(500); udelay(500);
pca->period_ns = period_ns; pca->period_ns = period_ns;
/*
* If the duty cycle did not change, restart PWM with
* the same duty cycle to period ratio and return.
*/
if (duty_ns == pca->duty_ns) {
regmap_update_bits(pca->regmap, PCA9685_MODE1,
MODE1_RESTART, 0x1);
return 0;
}
} else { } else {
dev_err(chip->dev, dev_err(chip->dev,
"prescaler not set: period out of bounds!\n"); "prescaler not set: period out of bounds!\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment