diff --git a/examples/host/cdc_msc_hid/src/tusb_config.h b/examples/host/cdc_msc_hid/src/tusb_config.h
index e957b2cde..80ee8cb01 100644
--- a/examples/host/cdc_msc_hid/src/tusb_config.h
+++ b/examples/host/cdc_msc_hid/src/tusb_config.h
@@ -39,13 +39,13 @@
   #error CFG_TUSB_MCU must be defined
 #endif
 
-#define CFG_TUH_RPI_PIO            1
+#define CFG_TUH_RPI_PIO_USB            1
 //#define CFG_TUSB_RPI_PIO_INC_PATH   1
 
 
 #if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX
   #define CFG_TUSB_RHPORT0_MODE       (OPT_MODE_HOST | OPT_MODE_HIGH_SPEED)
-#elif CFG_TUH_RPI_PIO
+#elif CFG_TUH_RPI_PIO_USB
   // rp2040: port0 is native, port 1 for PIO-USB
   #define CFG_TUSB_RHPORT1_MODE       OPT_MODE_HOST
 #else
diff --git a/src/host/usbh.c b/src/host/usbh.c
index ea0a0809d..1f2a19527 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -779,7 +779,7 @@ static bool enum_get_addr0_device_desc_complete(uint8_t dev_addr, tusb_control_r
 
   if (_dev0.hub_addr == 0)
   {
-#if !CFG_TUH_RPI_PIO // skip this reset for pio-usb
+#if !CFG_TUH_RPI_PIO_USB // skip this reset for pio-usb
     // connected directly to roothub
     hcd_port_reset(_dev0.rhport);
     osal_task_delay(RESET_DELAY);
diff --git a/src/portable/raspberrypi/pio/hcd_pio.c b/src/portable/raspberrypi/pio/hcd_pio.c
index 74df49e0d..71645bd45 100644
--- a/src/portable/raspberrypi/pio/hcd_pio.c
+++ b/src/portable/raspberrypi/pio/hcd_pio.c
@@ -26,7 +26,7 @@
 
 #include "tusb_option.h"
 
-#if CFG_TUH_ENABLED && (CFG_TUSB_MCU == OPT_MCU_RP2040) && CFG_TUH_RPI_PIO
+#if CFG_TUH_ENABLED && (CFG_TUSB_MCU == OPT_MCU_RP2040) && CFG_TUH_RPI_PIO_USB
 
 #include "pico.h"
 #include "hardware/pio.h"
diff --git a/src/portable/raspberrypi/rp2040/hcd_rp2040.c b/src/portable/raspberrypi/rp2040/hcd_rp2040.c
index 75acefb65..53b372fcb 100644
--- a/src/portable/raspberrypi/rp2040/hcd_rp2040.c
+++ b/src/portable/raspberrypi/rp2040/hcd_rp2040.c
@@ -27,7 +27,7 @@
 
 #include "tusb_option.h"
 
-#if CFG_TUH_ENABLED && (CFG_TUSB_MCU == OPT_MCU_RP2040) && !CFG_TUH_RPI_PIO
+#if CFG_TUH_ENABLED && (CFG_TUSB_MCU == OPT_MCU_RP2040) && !CFG_TUH_RPI_PIO_USB
 
 #include "pico.h"
 #include "rp2040_usb.h"
diff --git a/src/tusb_option.h b/src/tusb_option.h
index 25e536787..44cdaa3a6 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -252,7 +252,7 @@
 
 
 //--------------------------------------------------------------------+
-// COMMON OPTIONS
+// Common Options (Default)
 //--------------------------------------------------------------------+
 
 // Debug enable to print out error message
@@ -280,7 +280,7 @@
 #endif
 
 //--------------------------------------------------------------------
-// DEVICE OPTIONS
+// Device Options (Default)
 //--------------------------------------------------------------------
 
 #ifndef CFG_TUD_ENDPOINT0_SIZE
@@ -345,7 +345,7 @@
 #endif
 
 //--------------------------------------------------------------------
-// HOST OPTIONS
+// Host Options (Default)
 //--------------------------------------------------------------------
 #if CFG_TUH_ENABLED
   #ifndef CFG_TUH_DEVICE_MAX
@@ -383,6 +383,11 @@
 #define CFG_TUH_VENDOR 0
 #endif
 
+// Enable PIO-USB software host controller
+#ifndef CFG_TUH_RPI_PIO_USB
+#define CFG_TUH_RPI_PIO_USB 0
+#endif
+
 //------------------------------------------------------------------
 // Configuration Validation
 //------------------------------------------------------------------