core: analog: add STM32U5xx support

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

libraries/SrcWrapper/src/stm32/analog.cpp

@@ -33,6 +33,8 @@ static PinName g_current_pin = NC;
 #ifndef ADC_SAMPLINGTIME
 #if defined(ADC_SAMPLETIME_8CYCLES_5)
 #define ADC_SAMPLINGTIME        ADC_SAMPLETIME_8CYCLES_5;
+#elif defined(ADC_SAMPLETIME_12CYCLES)
+#define ADC_SAMPLINGTIME        ADC_SAMPLETIME_12CYCLES;
 #elif defined(ADC_SAMPLETIME_12CYCLES_5)
 #define ADC_SAMPLINGTIME        ADC_SAMPLETIME_12CYCLES_5;
 #elif defined(ADC_SAMPLETIME_13CYCLES_5)
@@ -60,6 +62,8 @@ static PinName g_current_pin = NC;
 #define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_384CYCLES
 #elif defined(ADC_SAMPLETIME_810CYCLES_5)
 #define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_810CYCLES_5
+#elif defined(ADC_SAMPLETIME_814CYCLES)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_814CYCLES
 #elif defined(ADC_SAMPLETIME_640CYCLES_5)
 #define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_640CYCLES_5
 #elif defined(ADC_SAMPLETIME_601CYCLES_5)
@@ -176,6 +180,7 @@ static uint32_t get_adc_channel(PinName pin, uint32_t *bank)
     case 23:
       channel = ADC_CHANNEL_23;
       break;
+#ifdef ADC_CHANNEL_24
     case 24:
       channel = ADC_CHANNEL_24;
       break;
@@ -202,6 +207,7 @@ static uint32_t get_adc_channel(PinName pin, uint32_t *bank)
       channel = ADC_CHANNEL_31;
       break;
 #endif
+#endif
 #endif
     default:
       channel = 0;
@@ -588,6 +594,9 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
 #endif
 #ifdef ADC4
   else if (hadc->Instance == ADC4) {
+#ifdef __HAL_RCC_ADC4_CLK_ENABLE
+    __HAL_RCC_ADC4_CLK_ENABLE();
+#endif
 #ifdef __HAL_RCC_ADC34_CLK_ENABLE
     __HAL_RCC_ADC34_CLK_ENABLE();
 #endif
@@ -707,6 +716,15 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)
 #endif
 #ifdef ADC4
   else if (hadc->Instance == ADC4) {
+#ifdef __HAL_RCC_ADC4_FORCE_RESET
+    __HAL_RCC_ADC4_FORCE_RESET();
+#endif
+#ifdef __HAL_RCC_ADC4_RELEASE_RESET
+    __HAL_RCC_ADC4_RELEASE_RESET();
+#endif
+#ifdef __HAL_RCC_ADC4_CLK_DISABLE
+    __HAL_RCC_ADC4_CLK_DISABLE();
+#endif
 #ifdef __HAL_RCC_ADC34_FORCE_RESET
     __HAL_RCC_ADC34_FORCE_RESET();
 #endif
@@ -910,7 +928,7 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
 #endif /* STM32L4xx || STM32WBxx */
     return 0;
   }
-#ifdef ADC_SCAN_SEQ_FIXED
+#if defined(ADC_SCAN_SEQ_FIXED) && defined(ADC_RANK_CHANNEL_NUMBER)
   AdcChannelConf.Rank         = ADC_RANK_CHANNEL_NUMBER;          /* Enable the rank of the selected channels when not fully configurable */
 #else
   AdcChannelConf.Rank         = ADC_REGULAR_RANK_1;               /* Specifies the rank in the regular group sequencer */
@@ -954,7 +972,7 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
 #if defined(STM32F0xx) || defined(STM32G0xx) || defined(STM32F1xx) || \
     defined(STM32WLxx) || defined(STM32F373xC) || defined(STM32F378xx)
   if (HAL_ADCEx_Calibration_Start(&AdcHandle) !=  HAL_OK)
-#elif defined (STM32H7xx) || defined(STM32MP1xx)
+#elif defined (STM32H7xx) || defined(STM32MP1xx) || defined(STM32U5xx)
   if (HAL_ADCEx_Calibration_Start(&AdcHandle, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED) != HAL_OK)
 #else
   if (HAL_ADCEx_Calibration_Start(&AdcHandle, ADC_SINGLE_ENDED) !=  HAL_OK)
@@ -967,7 +985,7 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
 
   /*##-3- Start the conversion process ####################*/
   if (HAL_ADC_Start(&AdcHandle) != HAL_OK) {
-    /* Start Conversation Error */
+    /* Start Conversion Error */
     return 0;
   }
 

libraries/SrcWrapper/src/stm32/hw_config.c

@@ -28,15 +28,18 @@ void hw_config_init(void)
 {
   configIPClock();
 
-#if defined(PWR_CR3_UCPD_DBDIS) || defined(STM32L5xx)
+#if defined(PWR_CR3_UCPD_DBDIS) || defined(PWR_UCPDR_UCPD_DBDIS)
   /* Disable the internal Pull-Up in Dead Battery pins of UCPD peripheral */
   HAL_PWREx_DisableUCPDDeadBattery();
 #endif
-#if defined (SYSCFG_CFGR1_UCPD1_STROBE) || defined (SYSCFG_CFGR1_UCPD2_STROBE)
+#if defined(SYSCFG_CFGR1_UCPD1_STROBE) || defined(SYSCFG_CFGR1_UCPD2_STROBE)
   /* Disable the internal Pull-Up in Dead Battery pins of UCPD peripheral */
   HAL_SYSCFG_StrobeDBattpinsConfig(SYSCFG_CFGR1_UCPD1_STROBE | SYSCFG_CFGR1_UCPD2_STROBE);
 #endif /* SYSCFG_CFGR1_UCPD1_STROBE || SYSCFG_CFGR1_UCPD2_STROBE */
 
+#if defined(PWR_SVMCR_ASV)
+  HAL_PWREx_EnableVddA();
+#endif
   /* Init DWT if present */
 #ifdef DWT_BASE
   dwt_init();