This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch releases/12.13
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/releases/12.13 by this push:
new ba0f1806a21 stm32h5/adc: fix TROVS bit and watchdog threshold register
writes
ba0f1806a21 is described below
commit ba0f1806a21ce55c6277ebbb861d49978bd1eeda
Author: kywwilson11 <[email protected]>
AuthorDate: Tue Mar 24 15:40:45 2026 -0500
stm32h5/adc: fix TROVS bit and watchdog threshold register writes
Fix adc_oversample() where priv->trovs (a bool, 0 or 1) was OR'd
directly into setbits instead of using ADC_CFGR2_TROVS (bit 9).
This caused triggered oversampling to never actually be enabled.
Fix ANIOC_WDOG_UPPER and ANIOC_WDOG_LOWER ioctls where the TR1
register was overwritten with only the new threshold value, zeroing
out the opposite threshold and the AWDFILT digital filter bits.
Use read-modify-write to preserve the other fields.
Signed-off-by: kywwilson11 <[email protected]>
---
arch/arm/src/stm32h5/stm32_adc.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/stm32h5/stm32_adc.c b/arch/arm/src/stm32h5/stm32_adc.c
index b44d778a474..d0b69e53beb 100644
--- a/arch/arm/src/stm32h5/stm32_adc.c
+++ b/arch/arm/src/stm32h5/stm32_adc.c
@@ -1069,7 +1069,10 @@ static void adc_oversample(struct adc_dev_s *dev)
(priv->ovsr << ADC_CFGR2_OVSR_SHIFT) |
(priv->ovss << ADC_CFGR2_OVSS_SHIFT);
- setbits |= priv->trovs;
+ if (priv->trovs)
+ {
+ setbits |= ADC_CFGR2_TROVS;
+ }
adc_modifyreg(priv, STM32_ADC_CFGR2_OFFSET, clrbits, setbits);
}
@@ -1811,7 +1814,8 @@ static int adc_ioctl(struct adc_dev_s *dev, int cmd,
unsigned long arg)
/* Set the watchdog threshold register */
- regval = ((arg << ADC_TR1_HT1_SHIFT) & ADC_TR1_HT1_MASK);
+ regval &= ~ADC_TR1_HT1_MASK;
+ regval |= ((arg << ADC_TR1_HT1_SHIFT) & ADC_TR1_HT1_MASK);
adc_putreg(priv, STM32_ADC_TR1_OFFSET, regval);
/* Ensure analog watchdog is enabled */
@@ -1845,7 +1849,8 @@ static int adc_ioctl(struct adc_dev_s *dev, int cmd,
unsigned long arg)
/* Set the watchdog threshold register */
- regval = ((arg << ADC_TR1_LT1_SHIFT) & ADC_TR1_LT1_MASK);
+ regval &= ~ADC_TR1_LT1_MASK;
+ regval |= ((arg << ADC_TR1_LT1_SHIFT) & ADC_TR1_LT1_MASK);
adc_putreg(priv, STM32_ADC_TR1_OFFSET, regval);
/* Ensure analog watchdog is enabled */
