diff --git a/arch/xtensa/include/esp32/chip.h b/arch/xtensa/include/esp32/chip.h
index e3cbc193c5f..08cd3443bde 100644
--- a/arch/xtensa/include/esp32/chip.h
+++ b/arch/xtensa/include/esp32/chip.h
@@ -51,6 +51,8 @@
 #define ESP32_NSPI   4 /* SPI0-3 */
 #define ESP32_NUARTS 3 /* UART0-2 */
 
+#define ESP32_NGPIOS 40 /* GPIO0-39 */
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
diff --git a/arch/xtensa/src/esp32/esp32_gpio.c b/arch/xtensa/src/esp32/esp32_gpio.c
index 25bf4fac9a5..cbb90f56533 100644
--- a/arch/xtensa/src/esp32/esp32_gpio.c
+++ b/arch/xtensa/src/esp32/esp32_gpio.c
@@ -163,7 +163,7 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
   uint32_t cntrl;
   unsigned int pinmode;
 
-  DEBUGASSERT(pin >= 0 && pin <= ESP32_NIRQ_GPIO);
+  DEBUGASSERT(pin >= 0 && pin <= ESP32_NGPIOS);
 
   /* Handle input pins */
 
@@ -250,7 +250,7 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
 
 void esp32_gpiowrite(int pin, bool value)
 {
-  DEBUGASSERT(pin >= 0 && pin <= ESP32_NIRQ_GPIO);
+  DEBUGASSERT(pin >= 0 && pin <= ESP32_NGPIOS);
 
   if (value)
     {
@@ -288,7 +288,7 @@ bool esp32_gpioread(int pin)
 {
   uint32_t regval;
 
-  DEBUGASSERT(pin >= 0 && pin <= ESP32_NIRQ_GPIO);
+  DEBUGASSERT(pin >= 0 && pin <= ESP32_NGPIOS);
 
   if (pin < 32)
     {