summaryrefslogtreecommitdiff
path: root/drivers/pwm/pwm-stm32.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2025-01-15 19:51:56 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2025-01-15 19:51:56 +0300
commit5cf32aff2088e650f73f6e291d96cdadd5c02c7a (patch)
treedba4b4f7e735212aa5ee9fd8e16b754179072390 /drivers/pwm/pwm-stm32.c
parent10b2c8a67c4b8ec15f9d07d177f63b563418e948 (diff)
parent2737dee1067c2fc02256b2b15dab158c5e840568 (diff)
downloadlinux-5cf32aff2088e650f73f6e291d96cdadd5c02c7a.tar.xz
Merge tag 'loongarch-kvm-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD
LoongArch KVM changes for v6.14 1. Clear LLBCTL if secondary mmu mapping changed. 2. Add hypercall service support for usermode VMM. This is a really small changeset, because the Chinese New Year (Spring Festival) is coming. Happy New Year!
Diffstat (limited to 'drivers/pwm/pwm-stm32.c')
-rw-r--r--drivers/pwm/pwm-stm32.c2
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);