diff --git a/src/portable/espressif/esp32s2/dcd_esp32s2.c b/src/portable/espressif/esp32s2/dcd_esp32s2.c
index ed01c7877..27312824e 100644
--- a/src/portable/espressif/esp32s2/dcd_esp32s2.c
+++ b/src/portable/espressif/esp32s2/dcd_esp32s2.c
@@ -125,7 +125,7 @@ static void bus_reset(void)
 static void enum_done_processing(void)
 {
 
-    ESP_EARLY_LOGV(TAG, "dcd_int_handler - Speed enumeration done! Sending DCD_EVENT_BUS_RESET then");
+    ESP_EARLY_LOGV(TAG, "dcd_irq_handler - Speed enumeration done! Sending DCD_EVENT_BUS_RESET then");
     // On current silicon on the Full Speed core, speed is fixed to Full Speed.
     // However, keep for debugging and in case Low Speed is ever supported.
     uint32_t enum_spd = (USB0.dsts >> USB_ENUMSPD_S) & (USB_ENUMSPD_V);
@@ -658,28 +658,28 @@ static void handle_epin_ints(void)
 }
 
 
-static void dcd_int_handler(void* arg)
+void dcd_irq_handler(uint32_t rhport)
 {
-    (void) arg;
+    (void) rhport;
 
     const uint32_t int_status = USB0.gintsts;
     //const uint32_t int_msk = USB0.gintmsk;
 
     if (int_status & USB_DISCONNINT_M) {
-        ESP_EARLY_LOGV(TAG, "dcd_int_handler - disconnected");
+        ESP_EARLY_LOGV(TAG, "dcd_irq_handler - disconnected");
         USB0.gintsts = USB_DISCONNINT_M;
         dcd_event_bus_signal(0, DCD_EVENT_UNPLUGGED, true);
     }
 
     if (int_status & USB_USBRST_M) {
         // start of reset
-        ESP_EARLY_LOGV(TAG, "dcd_int_handler - reset");
+        ESP_EARLY_LOGV(TAG, "dcd_irq_handler - reset");
         USB0.gintsts = USB_USBRST_M;
         bus_reset();
     }
 
     if (int_status & USB_RESETDET_M) {
-        ESP_EARLY_LOGV(TAG, "dcd_int_handler - reset while suspend");
+        ESP_EARLY_LOGV(TAG, "dcd_irq_handler - reset while suspend");
         USB0.gintsts = USB_RESETDET_M;
         bus_reset();
     }
@@ -701,7 +701,7 @@ static void dcd_int_handler(void* arg)
 #endif
 
     if ((int_status & USB_RXFLVI_M) /*& (int_msk & USB_RXFLVIMSK_M)*/) {
-        ESP_EARLY_LOGV(TAG, "dcd_int_handler - rx!");
+        ESP_EARLY_LOGV(TAG, "dcd_irq_handler - rx!");
         USB0.gintmsk &= ~USB_RXFLVIMSK_M;
         read_rx_fifo();
         USB0.gintmsk |= USB_RXFLVIMSK_M;
@@ -710,13 +710,13 @@ static void dcd_int_handler(void* arg)
 
     // OUT endpoint interrupt handling.
     if (int_status & USB_OEPINT_M) {
-        ESP_EARLY_LOGV(TAG, "dcd_int_handler - OUT endpoint!");
+        ESP_EARLY_LOGV(TAG, "dcd_irq_handler - OUT endpoint!");
         handle_epout_ints();
     }
 
     // IN endpoint interrupt handling.
     if (int_status & USB_IEPINT_M) {
-        ESP_EARLY_LOGV(TAG, "dcd_int_handler - IN endpoint!");
+        ESP_EARLY_LOGV(TAG, "dcd_irq_handler - IN endpoint!");
         handle_epin_ints();
     }
 
@@ -741,7 +741,7 @@ static void dcd_int_handler(void* arg)
 void dcd_int_enable(uint8_t rhport)
 {
     (void)rhport;
-    esp_intr_alloc(ETS_USB_INTR_SOURCE, ESP_INTR_FLAG_LOWMED, (intr_handler_t)dcd_int_handler, NULL, &usb_ih);
+    esp_intr_alloc(ETS_USB_INTR_SOURCE, ESP_INTR_FLAG_LOWMED, (intr_handler_t)dcd_irq_handler, NULL, &usb_ih);
 }
 
 void dcd_int_disable(uint8_t rhport)