Skip to content

Commit

Permalink
pwm: stm32: Replace write_ccrx with regmap_write
Browse files Browse the repository at this point in the history
The TIM_CCR1...4 registers are consecutive, so replace the switch
case with a simple calculation. Since ch is known to be in the 0...3
range (it is set to hwpwm < npwm <= 4), drop the unnecessary error
handling. The return value was not checked anyway. What remains does
not warrant keeping the write_ccrx() function around, so instead call
regmap_write() directly at the singular call site.

Signed-off-by: Philipp Zabel <[email protected]>
Signed-off-by: Uwe Kleine-König <[email protected]>
Reviewed-by: Fabrice Gasnier <[email protected]>
Signed-off-by: Thierry Reding <[email protected]>
  • Loading branch information
pH5 authored and thierryreding committed Dec 20, 2023
1 parent 7ee2273 commit e495f47
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions drivers/pwm/pwm-stm32.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,6 @@ static u32 active_channels(struct stm32_pwm *dev)
return ccer & TIM_CCER_CCXE;
}

static int write_ccrx(struct stm32_pwm *dev, int ch, u32 value)
{
switch (ch) {
case 0:
return regmap_write(dev->regmap, TIM_CCR1, value);
case 1:
return regmap_write(dev->regmap, TIM_CCR2, value);
case 2:
return regmap_write(dev->regmap, TIM_CCR3, value);
case 3:
return regmap_write(dev->regmap, TIM_CCR4, value);
}
return -EINVAL;
}

#define TIM_CCER_CC12P (TIM_CCER_CC1P | TIM_CCER_CC2P)
#define TIM_CCER_CC12E (TIM_CCER_CC1E | TIM_CCER_CC2E)
#define TIM_CCER_CC34P (TIM_CCER_CC3P | TIM_CCER_CC4P)
Expand Down Expand Up @@ -369,7 +354,7 @@ static int stm32_pwm_config(struct stm32_pwm *priv, int ch,
dty = prd * duty_ns;
do_div(dty, period_ns);

write_ccrx(priv, ch, dty);
regmap_write(priv->regmap, TIM_CCR1 + 4 * ch, dty);

/* Configure output mode */
shift = (ch & 0x1) * CCMR_CHANNEL_SHIFT;
Expand Down

0 comments on commit e495f47

Please sign in to comment.