Commit 8654fa5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pwm/for-6.11-rc7-fixes' of git://git.kernel.org/pub/scm/linux/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 #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()
parents ea462f0f 10c48e9a

drivers/pwm/pwm-stm32.c

+1 −1
Original line number Diff line number Diff line
@@ -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);