mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pwm: bcm2835: Support apply function for atomic configuration

Browse source 
Use the newer .apply function of pwm_ops instead of .config, .enable,
.disable and .set_polarity. This guarantees atomic changes of the pwm
controller configuration. It also reduces the size of the driver.

Since now period is a 64 bit value, add an extra check to reject periods
that exceed the possible max value for the 32 bit register.

This has been tested on a Raspberry PI 4.

Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
This commit is contained in:
Lino Sanfilippo 2020-12-09 21:48:25 +01:00 committed by Thierry Reding
parent bb72e1dbae
commit 2f81b51d0d
1 changed files with 25 additions and 46 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

71
drivers/pwm/pwm-bcm2835.c
View file

@ -58,13 +58,15 @@ static void bcm2835_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
writel(value, pc->base + PWM_CONTROL); writel(value, pc->base + PWM_CONTROL);
} }
static int bcm2835_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
int duty_ns, int period_ns) const struct pwm_state *state)
{ {
struct bcm2835_pwm *pc = to_bcm2835_pwm(chip); struct bcm2835_pwm *pc = to_bcm2835_pwm(chip);
unsigned long rate = clk_get_rate(pc->clk); unsigned long rate = clk_get_rate(pc->clk);
unsigned long long period;
unsigned long scaler; unsigned long scaler;
u32 period; u32 val;
if (!rate) { if (!rate) {
dev_err(pc->dev, "failed to get clock rate\n"); dev_err(pc->dev, "failed to get clock rate\n");
@ -72,54 +74,34 @@ static int bcm2835_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
} }
scaler = DIV_ROUND_CLOSEST(NSEC_PER_SEC, rate); scaler = DIV_ROUND_CLOSEST(NSEC_PER_SEC, rate);
period = DIV_ROUND_CLOSEST(period_ns, scaler); /* set period */
period = DIV_ROUND_CLOSEST_ULL(state->period, scaler);
if (period < PERIOD_MIN) /* dont accept a period that is too small or has been truncated */
if ((period < PERIOD_MIN) || (period > U32_MAX))
return -EINVAL; return -EINVAL;
writel(DIV_ROUND_CLOSEST(duty_ns, scaler),
pc->base + DUTY(pwm->hwpwm));
writel(period, pc->base + PERIOD(pwm->hwpwm)); writel(period, pc->base + PERIOD(pwm->hwpwm));
return 0; /* set duty cycle */
} val = DIV_ROUND_CLOSEST_ULL(state->duty_cycle, scaler);
writel(val, pc->base + DUTY(pwm->hwpwm));
static int bcm2835_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) /* set polarity */
{ val = readl(pc->base + PWM_CONTROL);
struct bcm2835_pwm *pc = to_bcm2835_pwm(chip);
u32 value;
value = readl(pc->base + PWM_CONTROL); if (state->polarity == PWM_POLARITY_NORMAL)
value |= PWM_ENABLE << PWM_CONTROL_SHIFT(pwm->hwpwm); val &= ~(PWM_POLARITY << PWM_CONTROL_SHIFT(pwm->hwpwm));
writel(value, pc->base + PWM_CONTROL);
return 0;
}
static void bcm2835_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
{
struct bcm2835_pwm *pc = to_bcm2835_pwm(chip);
u32 value;
value = readl(pc->base + PWM_CONTROL);
value &= ~(PWM_ENABLE << PWM_CONTROL_SHIFT(pwm->hwpwm));
writel(value, pc->base + PWM_CONTROL);
}
static int bcm2835_set_polarity(struct pwm_chip *chip, struct pwm_device *pwm,
enum pwm_polarity polarity)
{
struct bcm2835_pwm *pc = to_bcm2835_pwm(chip);
u32 value;
value = readl(pc->base + PWM_CONTROL);
if (polarity == PWM_POLARITY_NORMAL)
value &= ~(PWM_POLARITY << PWM_CONTROL_SHIFT(pwm->hwpwm));
else else
value |= PWM_POLARITY << PWM_CONTROL_SHIFT(pwm->hwpwm); val |= PWM_POLARITY << PWM_CONTROL_SHIFT(pwm->hwpwm);
writel(value, pc->base + PWM_CONTROL); /* enable/disable */
if (state->enabled)
val |= PWM_ENABLE << PWM_CONTROL_SHIFT(pwm->hwpwm);
else
val &= ~(PWM_ENABLE << PWM_CONTROL_SHIFT(pwm->hwpwm));
writel(val, pc->base + PWM_CONTROL);
return 0; return 0;
} }
@ -127,10 +109,7 @@ static int bcm2835_set_polarity(struct pwm_chip *chip, struct pwm_device *pwm,
static const struct pwm_ops bcm2835_pwm_ops = { static const struct pwm_ops bcm2835_pwm_ops = {
.request = bcm2835_pwm_request, .request = bcm2835_pwm_request,
.free = bcm2835_pwm_free, .free = bcm2835_pwm_free,
.config = bcm2835_pwm_config, .apply = bcm2835_pwm_apply,
.enable = bcm2835_pwm_enable,
.disable = bcm2835_pwm_disable,
.set_polarity = bcm2835_set_polarity,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };