diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-19 08:50:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-19 08:50:05 -0800 |
| commit | a0db71c7fe57bf08dcb46376237b78317c035b69 (patch) | |
| tree | cc684af4a61a8abc3feca7a6de95df3d869bce62 | |
| parent | Merge tag 'v6.13-rc3-ksmbd-server-fixes' of git://git.samba.org/ksmbd (diff) | |
| parent | pwm: stm32: Fix complementary output in round_waveform_tohw() (diff) | |
| download | wireguard-linux-a0db71c7fe57bf08dcb46376237b78317c035b69.tar.xz wireguard-linux-a0db71c7fe57bf08dcb46376237b78317c035b69.zip | |
Merge tag 'pwm/for-6.13-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux
Pull pwm fix from Uwe Kleine-König:
"Fix regression in pwm-stm32 driver when converting to new waveform
support
Fabrice Gasnier found and fixed a regression I introduced with
v6.13-rc1 when converting the stm32 pwm driver to support the new
waveform stuff. On some hardware variants this completely broke the
driver"
* tag 'pwm/for-6.13-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
pwm: stm32: Fix complementary output in round_waveform_tohw()
Diffstat (limited to '')
| -rw-r--r-- | drivers/pwm/pwm-stm32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c index b889e64522c3..17e591f61efb 100644 --- a/drivers/pwm/pwm-stm32.c +++ b/drivers/pwm/pwm-stm32.c @@ -84,7 +84,7 @@ static int stm32_pwm_round_waveform_tohw(struct pwm_chip *chip, wfhw->ccer = TIM_CCER_CCxE(ch + 1); if (priv->have_complementary_output) - wfhw->ccer = TIM_CCER_CCxNE(ch + 1); + wfhw->ccer |= TIM_CCER_CCxNE(ch + 1); rate = clk_get_rate(priv->clk); |