diff options
| author | Dave Airlie <[email protected]> | 2025-01-10 04:24:17 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2025-01-10 04:24:17 +0000 |
| commit | f6001870edeabf0f7bc0460303d0cdbb9f0b3bc4 (patch) | |
| tree | acda60340b486b9893d96b864617f66286a4c3c6 /drivers/pwm/pwm-stm32.c | |
| parent | Merge tag 'drm-etnaviv-next-2025-01-08' of https://git.pengutronix.de/git/lst... (diff) | |
| parent | Linux 6.13-rc6 (diff) | |
| download | kernel-f6001870edeabf0f7bc0460303d0cdbb9f0b3bc4.tar.gz kernel-f6001870edeabf0f7bc0460303d0cdbb9f0b3bc4.zip | |
Merge tag 'v6.13-rc6' into drm-next
This backmerges Linux 6.13-rc6 this is need for the newer pulls.
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'drivers/pwm/pwm-stm32.c')
| -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); |