check for PWR_USBSCR_USB33DEN before enabling USB VDD

hathach · Apr 2, 2024 · f285928 · f285928
1 parent 4b99370
commit f285928
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/hw/bsp/stm32h5/boards/stm32h503nucleo/board.h b/hw/bsp/stm32h5/boards/stm32h503nucleo/board.h
@@ -115,10 +115,6 @@ static inline void SystemClock_Config(void) {
   __HAL_RCC_USB_CLK_ENABLE();
 }
 
-static inline void board_enable_vdd_usb(void) {
-  // USB in STM32H503RB does not require enabling VDD
-}
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/hw/bsp/stm32h5/boards/stm32h563nucleo/board.h b/hw/bsp/stm32h5/boards/stm32h563nucleo/board.h
@@ -122,10 +122,6 @@ static inline void SystemClock_Config(void) {
   __HAL_RCC_USB_CLK_ENABLE();
 }
 
-static inline void board_enable_vdd_usb(void) {
-  /* Enable VDDUSB to power on USB peripheral */
-  HAL_PWREx_EnableVddUSB();
-}
 #ifdef __cplusplus
 }
 #endif

diff --git a/hw/bsp/stm32h5/boards/stm32h573i_dk/board.h b/hw/bsp/stm32h5/boards/stm32h573i_dk/board.h
@@ -108,11 +108,6 @@ static inline void SystemClock_Config(void) {
   __HAL_RCC_USB_CLK_ENABLE();
 }
 
-static inline void board_enable_vdd_usb(void) {
-  /* Enable VDDUSB to power on USB peripheral */
-  HAL_PWREx_EnableVddUSB();
-}
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/hw/bsp/stm32h5/family.c b/hw/bsp/stm32h5/family.c
@@ -145,7 +145,9 @@ void board_init(void) {
   __HAL_RCC_USB_CLK_ENABLE();
 
   /* Enable VDDUSB */
-  board_enable_vdd_usb();
+  #if defined (PWR_USBSCR_USB33DEN)
+  HAL_PWREx_EnableVddUSB();
+  #endif
 }
 
 //--------------------------------------------------------------------+