From 329727784b8613a022d506ca0242757c7718ac3f Mon Sep 17 00:00:00 2001
From: Koen Zandberg <koen@bergzand.net>
Date: Fri, 31 Mar 2023 16:43:51 +0200
Subject: [PATCH] Revert "boards/stm32f429-disc*: do not use periph_usbdev_hs"

This reverts commit 05160f9c2adc372f09ea4b7d1213a2ba8327a003.
---
 boards/common/stm32/include/cfg_usb_otg_hs_phy_fs.h | 2 +-
 boards/stm32f429i-disc1/Kconfig                     | 3 +++
 boards/stm32f429i-disc1/Makefile.dep                | 4 ++++
 boards/stm32f429i-disc1/Makefile.features           | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/boards/common/stm32/include/cfg_usb_otg_hs_phy_fs.h b/boards/common/stm32/include/cfg_usb_otg_hs_phy_fs.h
index 6e2b2b63e1..aa3e77cfeb 100644
--- a/boards/common/stm32/include/cfg_usb_otg_hs_phy_fs.h
+++ b/boards/common/stm32/include/cfg_usb_otg_hs_phy_fs.h
@@ -36,7 +36,7 @@ extern "C" {
 #define DWC2_USB_OTG_HS_ENABLED
 
 /**
- * @brief Common USB OTG HS configuration with on-chip FS PHY
+ * @brief Common USB OTG FS configuration
  */
 static const dwc2_usb_otg_fshs_config_t dwc2_usb_otg_fshs_config[] = {
     {
diff --git a/boards/stm32f429i-disc1/Kconfig b/boards/stm32f429i-disc1/Kconfig
index ff05e0293c..33303137a9 100644
--- a/boards/stm32f429i-disc1/Kconfig
+++ b/boards/stm32f429i-disc1/Kconfig
@@ -20,6 +20,7 @@ config BOARD_STM32F429I_DISC1
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
     select HAS_PERIPH_USBDEV
+    select HAS_PERIPH_USBDEV_HS
 
     # Put other features for this board (in alphabetical order)
     select HAS_RIOTBOOT
@@ -38,4 +39,6 @@ config BOARD_STM32F429I_DISC1
     select HAVE_I3G4250D
     select HAVE_L3GD20
 
+    select MODULE_PERIPH_USBDEV_HS if MODULE_PERIPH_USBDEV
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
diff --git a/boards/stm32f429i-disc1/Makefile.dep b/boards/stm32f429i-disc1/Makefile.dep
index 1b5ae322af..18b88c7611 100644
--- a/boards/stm32f429i-disc1/Makefile.dep
+++ b/boards/stm32f429i-disc1/Makefile.dep
@@ -1,3 +1,7 @@
+ifneq (,$(filter periph_usbdev,$(USEMODULE)))
+  USEMODULE += periph_usbdev_hs
+endif
+
 ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += saul_gpio
   USEMODULE += l3gxxxx
diff --git a/boards/stm32f429i-disc1/Makefile.features b/boards/stm32f429i-disc1/Makefile.features
index 8ce979e427..3ddc733cbf 100644
--- a/boards/stm32f429i-disc1/Makefile.features
+++ b/boards/stm32f429i-disc1/Makefile.features
@@ -8,6 +8,7 @@ FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += periph_usbdev
+FEATURES_PROVIDED += periph_usbdev_hs
 
 # Put other features for this board (in alphabetical order)
 FEATURES_PROVIDED += riotboot