Skip to content

Commit

Permalink
Merge tag 'pwm/for-6.11-rc7-fixes' of git://git.kernel.org/pub/scm/li…
Browse files Browse the repository at this point in the history
…nux/kernel/git/ukleinek/linux

Pull pwm fix from Uwe Kleine-König:
 "Fix an off-by-one in the stm32 driver.

  Hardware engineers tend to start counting at 1 while the software guys
  usually start with 0. This isn't so nice because that results in
  drivers where pwm device Rust-for-Linux#2 needs to use the hardware registers with
  index 3.

  This was noticed by Fabrice Gasnier.

  A small patch fixing that mismatch is the only change included here"

* tag 'pwm/for-6.11-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
  pwm: stm32: Use the right CCxNP bit in stm32_pwm_enable()
  • Loading branch information
torvalds committed Sep 6, 2024
2 parents ea462f0 + 10c48e9 commit 8654fa5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pwm/pwm-stm32.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ static int stm32_pwm_enable(struct stm32_pwm *priv, unsigned int ch)
/* Enable channel */
mask = TIM_CCER_CCxE(ch + 1);
if (priv->have_complementary_output)
mask |= TIM_CCER_CCxNE(ch);
mask |= TIM_CCER_CCxNE(ch + 1);

regmap_set_bits(priv->regmap, TIM_CCER, mask);

Expand Down

0 comments on commit 8654fa5

Please sign in to comment.