3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32: No need for LDORDY check in stm32h7_adc.c 

Not all chips have the LDORDY flag, while all chips will stabilize in
10us.  There is no need for two different implementations as it is
safe to wait 20us on all chips.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2022-12-13 00:00:33 -05:00
parent e631840ad6
commit 9b7dcfa333
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/stm32/stm32h7_adc.c
View File

@ -29,11 +29,6 @@
#define OVERSAMPLES_EXPONENT 3 #define OVERSAMPLES_EXPONENT 3
#define OVERSAMPLES (1 << OVERSAMPLES_EXPONENT) #define OVERSAMPLES (1 << OVERSAMPLES_EXPONENT)
// LDORDY registers are missing from CMSIS (only available on revision V!)
#define ADC_ISR_LDORDY_Pos (12U)
#define ADC_ISR_LDORDY_Msk (0x1UL << ADC_ISR_LDORDY_Pos)
#define ADC_ISR_LDORDY ADC_ISR_LDORDY_Msk
#elif CONFIG_MACH_STM32L4 #elif CONFIG_MACH_STM32L4
#define ADCIN_BANK_SIZE (19) #define ADCIN_BANK_SIZE (19)
#define RCC_AHBENR_ADC (RCC->AHB2ENR) #define RCC_AHBENR_ADC (RCC->AHB2ENR)
@ -258,18 +253,10 @@ gpio_adc_setup(uint32_t pin)
MODIFY_REG(adc->CR, ADC_CR_DEEPPWD_Msk, 0); MODIFY_REG(adc->CR, ADC_CR_DEEPPWD_Msk, 0);
// Switch on voltage regulator // Switch on voltage regulator
adc->CR |= ADC_CR_ADVREGEN; adc->CR |= ADC_CR_ADVREGEN;
#ifdef ADC_ISR_LDORDY // Wait for voltage regulator to stabilize
if (is_stm32h723_adc3 == 0) {
while(!(adc->ISR & ADC_ISR_LDORDY))
;
} else
#endif
{
// stm32h723 ADC3 & stm32l4 lacks ldordy, delay to spec instead
uint32_t end = timer_read_time() + timer_from_us(20); uint32_t end = timer_read_time() + timer_from_us(20);
while (timer_is_before(timer_read_time(), end)) while (timer_is_before(timer_read_time(), end))
; ;
}
// Set Boost mode for 25Mhz < ADC clock <= 50Mhz // Set Boost mode for 25Mhz < ADC clock <= 50Mhz
#ifdef ADC_CR_BOOST #ifdef ADC_CR_BOOST