diff --git a/src/common/tusb_mcu.h b/src/common/tusb_mcu.h
index 41f552d33..0a039eadf 100644
--- a/src/common/tusb_mcu.h
+++ b/src/common/tusb_mcu.h
@@ -538,7 +538,7 @@
   #define TUP_DCD_EDPT_ISO_ALLOC
 #endif
 
-#if defined(TUP_USBIP_DWC2) // && CFG_TUD_DWC2_DMA == 0
+#if defined(TUP_USBIP_DWC2) // && CFG_TUD_DWC2_DMA_ENABLE == 0
   #define TUP_MEM_CONST_ADDR
 #endif
 
diff --git a/src/portable/synopsys/dwc2/dcd_dwc2.c b/src/portable/synopsys/dwc2/dcd_dwc2.c
index fe67de8dc..80287305a 100644
--- a/src/portable/synopsys/dwc2/dcd_dwc2.c
+++ b/src/portable/synopsys/dwc2/dcd_dwc2.c
@@ -71,7 +71,7 @@ static bool _sof_en;
 TU_ATTR_ALWAYS_INLINE static inline bool dma_device_enabled(const dwc2_regs_t* dwc2) {
   (void) dwc2;
   // Internal DMA only
-  return CFG_TUD_DWC2_DMA && dwc2->ghwcfg2_bm.arch == GHWCFG2_ARCH_INTERNAL_DMA;
+  return CFG_TUD_DWC2_DMA_ENABLE && dwc2->ghwcfg2_bm.arch == GHWCFG2_ARCH_INTERNAL_DMA;
 }
 
 static void dma_setup_prepare(uint8_t rhport) {
@@ -897,8 +897,6 @@ static void handle_epin_irq(uint8_t rhport) {
   Note: when OTG_MULTI_PROC_INTRPT = 1, Device Each endpoint interrupt deachint/deachmsk/diepeachmsk/doepeachmsk
   are combined to generate dedicated interrupt line for each endpoint.
  */
-
-
 void dcd_int_handler(uint8_t rhport) {
   dwc2_regs_t* dwc2 = DWC2_REG(rhport);
 
diff --git a/src/tusb_option.h b/src/tusb_option.h
index e9b6a5806..6257a87ba 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -252,8 +252,8 @@
 // (defined by CFG_TUSB_MEM_SECTION) must be declared as non-cacheable.
 // For example, on Cortex-M7 the MPU region can be configured as normal
 // non-cacheable, with RASR register value: TEX=1 C=0 B=0 S=0.
-#ifndef CFG_TUD_DWC2_DMA
-  #define CFG_TUD_DWC2_DMA 0
+#ifndef CFG_TUD_DWC2_DMA_ENABLE
+  #define CFG_TUD_DWC2_DMA_ENABLE 0
 #endif
 
 // Enable DWC2 Slave mode for host
diff --git a/test/hil/tinyusb.json b/test/hil/tinyusb.json
index c15daf1d9..b6c9b540a 100644
--- a/test/hil/tinyusb.json
+++ b/test/hil/tinyusb.json
@@ -17,7 +17,7 @@
             "name": "espressif_s3_devkitm",
             "uid": "84F703C084E4",
             "build" : {
-                "flags_on": ["", "CFG_TUD_DWC2_DMA"]
+                "flags_on": ["", "CFG_TUD_DWC2_DMA_ENABLE"]
             },
             "tests": {
                 "only": ["device/cdc_msc_freertos", "device/hid_composite_freertos"]
@@ -130,7 +130,7 @@
             "name": "stm32f723disco",
             "uid": "460029001951373031313335",
             "build" : {
-                "flags_on": ["", "CFG_TUD_DWC2_DMA"]
+                "flags_on": ["", "CFG_TUD_DWC2_DMA_ENABLE"]
             },
             "tests": {
                 "device": true, "host": true, "dual": false,
@@ -146,7 +146,7 @@
             "name": "stm32h743nucleo",
             "uid": "110018000951383432343236",
             "build" : {
-                "flags_on": ["", "CFG_TUD_DWC2_DMA"]
+                "flags_on": ["", "CFG_TUD_DWC2_DMA_ENABLE"]
             },
             "tests": {
                 "device": true, "host": false, "dual": false
@@ -175,7 +175,7 @@
             "name": "stm32f769disco",
             "uid": "21002F000F51363531383437",
             "build" : {
-                "flags_on": ["", "CFG_TUD_DWC2_DMA"]
+                "flags_on": ["", "CFG_TUD_DWC2_DMA_ENABLE"]
             },
             "tests": {
                 "device": true, "host": false, "dual": false