diff --git a/arch/arm/src/stm32/stm32f20xxx_rcc.c b/arch/arm/src/stm32/stm32f20xxx_rcc.c
index 4a7fd85740..fac0dc911d 100644
--- a/arch/arm/src/stm32/stm32f20xxx_rcc.c
+++ b/arch/arm/src/stm32/stm32f20xxx_rcc.c
@@ -193,9 +193,7 @@ static inline void rcc_enableahb1(void)
 #endif
 
 #ifdef CONFIG_STM32_OTGHS
-  /* USB OTG HS */
-
-#ifndef BOARD_DISABLE_USBOTG_HSULPI
+#ifdef BOARD_ENABLE_USBOTG_HSULPI
   /* Enable clocking for USB OTG HS and external PHY */
 
   regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);
diff --git a/arch/arm/src/stm32/stm32f40xxx_rcc.c b/arch/arm/src/stm32/stm32f40xxx_rcc.c
index e83d4f2573..dfed9d8fce 100644
--- a/arch/arm/src/stm32/stm32f40xxx_rcc.c
+++ b/arch/arm/src/stm32/stm32f40xxx_rcc.c
@@ -215,7 +215,7 @@ static inline void rcc_enableahb1(void)
 #endif
 
 #ifdef CONFIG_STM32_OTGHS
-#if 0 /* ifndef BOARD_DISABLE_USBOTG_HSULPI */
+#ifdef BOARD_ENABLE_USBOTG_HSULPI
   /* Enable clocking for  USB OTG HS and external PHY */
 
   regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);
diff --git a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
index 4ce433efd7..7a36d7c7ee 100644
--- a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
+++ b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
@@ -225,7 +225,7 @@ static inline void rcc_enableahb1(void)
 #endif
 
 #ifdef CONFIG_STM32F7_OTGHS
-#if 0 /* ifndef BOARD_DISABLE_USBOTG_HSULPI */
+#ifdef BOARD_ENABLE_USBOTG_HSULPI
   /* Enable clocking for  USB OTG HS and external PHY */
 
   regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);
diff --git a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
index 42080ebb16..5a08806eb3 100644
--- a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
+++ b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
@@ -221,7 +221,7 @@ static inline void rcc_enableahb1(void)
 #endif
 
 #ifdef CONFIG_STM32F7_OTGHS
-#if 0 /* ifndef BOARD_DISABLE_USBOTG_HSULPI */
+#ifdef BOARD_ENABLE_USBOTG_HSULPI
   /* Enable clocking for  USB OTG HS and external PHY */
 
   regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);
diff --git a/configs/photon/include/board.h b/configs/photon/include/board.h
index 08b62d125b..4db3368d1b 100644
--- a/configs/photon/include/board.h
+++ b/configs/photon/include/board.h
@@ -149,7 +149,7 @@
 /* USB OTG HS definitions ***********************************************************/
 /* Do not enable external PHY clock or OTG_HS module will not work */
 
-#define BOARD_DISABLE_USBOTG_HSULPI 1
+#undef  BOARD_ENABLE_USBOTG_HSULPI
 
 /* LED definitions ******************************************************************/