diff --git a/arch/arm/src/lpc11xx/Kconfig b/arch/arm/src/lpc11xx/Kconfig
index 31a9711cf07..33ab254958b 100644
--- a/arch/arm/src/lpc11xx/Kconfig
+++ b/arch/arm/src/lpc11xx/Kconfig
@@ -237,7 +237,7 @@ config CAN_REGDEBUG
 
 endmenu
 
-config GPIO_IRQ
+config LPC11_GPIOIRQ
 	bool "GPIO interrupt support"
 	default n
 	---help---
diff --git a/arch/arm/src/lpc11xx/Make.defs b/arch/arm/src/lpc11xx/Make.defs
index 041419c2488..a347d99946d 100644
--- a/arch/arm/src/lpc11xx/Make.defs
+++ b/arch/arm/src/lpc11xx/Make.defs
@@ -84,7 +84,7 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CHIP_CSRCS += lpc11_userspace.c
 endif
 
-ifeq ($(CONFIG_GPIO_IRQ),y)
+ifeq ($(CONFIG_LPC11_GPIOIRQ),y)
 CHIP_CSRCS += lpc11_gpioint.c
 endif
 
diff --git a/arch/arm/src/lpc11xx/lpc111x_gpio.c b/arch/arm/src/lpc11xx/lpc111x_gpio.c
index 6a0718e11d7..cba1ee71734 100644
--- a/arch/arm/src/lpc11xx/lpc111x_gpio.c
+++ b/arch/arm/src/lpc11xx/lpc111x_gpio.c
@@ -79,7 +79,7 @@
  * actually set up to interrupt until the interrupt is enabled.
  */
 
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
 uint64_t g_intedge0;
 uint64_t g_intedge2;
 #endif
@@ -295,7 +295,7 @@ static int lpc11_pullup(lpc11_pinset_t cfgset, unsigned int port,
  *
  ****************************************************************************/
 
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
 static void lpc11_setintedge(unsigned int port, unsigned int pin,
                              unsigned int value)
 {
@@ -323,7 +323,7 @@ static void lpc11_setintedge(unsigned int port, unsigned int pin,
   *intedge &= ~((uint64_t)3     << shift);
   *intedge |=  ((uint64_t)value << shift);
 }
-#endif /* CONFIG_GPIO_IRQ */
+#endif /* CONFIG_LPC11_GPIOIRQ */
 
 /****************************************************************************
  * Name: lpc11_setopendrain
@@ -453,7 +453,7 @@ static inline int lpc11_configinput(lpc11_pinset_t cfgset, unsigned int port,
 
       /* Forget about any falling/rising edge interrupt enabled */
 
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
       lpc11_setintedge(port, pin, 0);
 #endif
     }
@@ -495,7 +495,7 @@ static inline int lpc11_configinterrupt(lpc11_pinset_t cfgset, unsigned int port
   /* Then just remember the rising/falling edge interrupt enabled */
 
   DEBUGASSERT(port == 0 || port == 2);
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
   lpc11_setintedge(port, pin, (cfgset & GPIO_EDGE_MASK) >> GPIO_EDGE_SHIFT);
 #endif
   return OK;
diff --git a/arch/arm/src/lpc11xx/lpc11_gpio.h b/arch/arm/src/lpc11xx/lpc11_gpio.h
index a0e1c2d8990..f77b748613e 100644
--- a/arch/arm/src/lpc11xx/lpc11_gpio.h
+++ b/arch/arm/src/lpc11xx/lpc11_gpio.h
@@ -88,7 +88,7 @@ extern "C"
  * lpc11_gpioint.c, and lpc11_gpiodbg.c
  */
 
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
 EXTERN uint64_t g_intedge0;
 EXTERN uint64_t g_intedge2;
 #endif
@@ -108,7 +108,7 @@ EXTERN const uint32_t g_intbase[GPIO_NPORTS];
  *
  ************************************************************************************/
 
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
 void lpc11_gpioirqinitialize(void);
 #else
 #  define lpc11_gpioirqinitialize()
@@ -152,7 +152,7 @@ bool lpc11_gpioread(lpc11_pinset_t pinset);
  *
  ************************************************************************************/
 
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
 void lpc11_gpioirqenable(int irq);
 #else
 #  define lpc11_gpioirqenable(irq)
@@ -166,7 +166,7 @@ void lpc11_gpioirqenable(int irq);
  *
  ************************************************************************************/
 
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
 void lpc11_gpioirqdisable(int irq);
 #else
 #  define lpc11_gpioirqdisable(irq)
diff --git a/arch/arm/src/lpc11xx/lpc11_gpioint.c b/arch/arm/src/lpc11xx/lpc11_gpioint.c
index 4ce6b48c9ed..8aaefed1497 100644
--- a/arch/arm/src/lpc11xx/lpc11_gpioint.c
+++ b/arch/arm/src/lpc11xx/lpc11_gpioint.c
@@ -51,7 +51,7 @@
 #include "chip.h"
 #include "lpc11_gpio.h"
 
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -543,5 +543,5 @@ void lpc11_gpioirqdisable(int irq)
     }
 }
 
-#endif /* CONFIG_GPIO_IRQ */
+#endif /* CONFIG_LPC11_GPIOIRQ */
 
diff --git a/arch/arm/src/lpc11xx/lpc11_irq.c b/arch/arm/src/lpc11xx/lpc11_irq.c
index f861943bc0a..4399c582003 100644
--- a/arch/arm/src/lpc11xx/lpc11_irq.c
+++ b/arch/arm/src/lpc11xx/lpc11_irq.c
@@ -244,7 +244,7 @@ void up_irqinitialize(void)
    * configured pin interrupts.
    */
 
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
   lpc11_gpioirqinitialize();
 #endif
 
diff --git a/configs/lpcxpresso-lpc1115/minnsh/defconfig b/configs/lpcxpresso-lpc1115/minnsh/defconfig
index ea60c5f721e..edc83097727 100644
--- a/configs/lpcxpresso-lpc1115/minnsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/minnsh/defconfig
@@ -135,7 +135,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV6M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYL is not set
 CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL=y
-# CONFIG_GPIO_IRQ is not set
+# CONFIG_LPC11_GPIOIRQ is not set
 
 #
 # LPC11xx Configuration Options
diff --git a/configs/lpcxpresso-lpc1115/nsh/defconfig b/configs/lpcxpresso-lpc1115/nsh/defconfig
index 22a4a0c7dc9..c8b7d4b11c3 100644
--- a/configs/lpcxpresso-lpc1115/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/nsh/defconfig
@@ -135,7 +135,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV6M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYL is not set
 CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL=y
-# CONFIG_GPIO_IRQ is not set
+# CONFIG_LPC11_GPIOIRQ is not set
 
 #
 # LPC11xx Configuration Options
diff --git a/configs/lpcxpresso-lpc1115/src/lpcxpresso_lpc1115.h b/configs/lpcxpresso-lpc1115/src/lpcxpresso_lpc1115.h
index 5f3db65ba63..4f523e26b29 100644
--- a/configs/lpcxpresso-lpc1115/src/lpcxpresso_lpc1115.h
+++ b/configs/lpcxpresso-lpc1115/src/lpcxpresso_lpc1115.h
@@ -147,7 +147,7 @@
  */
 
 #define LPCXPRESSO_SD_CS (GPIO_OUTPUT | GPIO_VALUE_ONE | GPIO_PORT2 | GPIO_PIN2)
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
 #  define LPCXPRESSO_SD_CD (GPIO_INTBOTH | GPIO_PULLUP | GPIO_PORT2 | GPIO_PIN11)
 #else
 #  define LPCXPRESSO_SD_CD (GPIO_INPUT   | GPIO_PULLUP | GPIO_PORT2 | GPIO_PIN11)
@@ -183,7 +183,7 @@
  */
 
 #define LPCXPRESSO_USB_CONNECT (GPIO_OUTPUT | GPIO_VALUE_ONE | GPIO_PORT0 | GPIO_PIN21)
-#ifdef CONFIG_GPIO_IRQ
+#ifdef CONFIG_LPC11_GPIOIRQ
 #  define LPCXPRESSO_USB_VBUSSENSE (GPIO_INTBOTH | GPIO_PULLUP | GPIO_PORT0 | GPIO_PIN5)
 #else
 #  define LPCXPRESSO_USB_VBUSSENSE (GPIO_INPUT   | GPIO_PULLUP | GPIO_PORT0 | GPIO_PIN5)