diff --git a/arch/arm/include/tiva/irq.h b/arch/arm/include/tiva/irq.h
index 53da296d9b..d0dedc9ced 100644
--- a/arch/arm/include/tiva/irq.h
+++ b/arch/arm/include/tiva/irq.h
@@ -95,13 +95,13 @@
 #  undef CONFIG_TIVA_GPIOQ_IRQS
 #endif
 #if TIVA_NPORTS < 16
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOR_IRQS
 #endif
 #if TIVA_NPORTS < 17
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOS_IRQS
 #endif
 #if TIVA_NPORTS < 18
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOT_IRQS
 #endif
 
 /* Processor Exceptions (vectors 0-15) */
diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c b/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c
index 7a8a4aaf66..acc0d04fe9 100644
--- a/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c
+++ b/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c
@@ -237,6 +237,14 @@ static int gpioport2irq(uint8_t port)
         }
         break;
 #endif
+
+#ifdef CONFIG_TIVA_GPIOT_IRQS
+      case (GPIO_PORTT >> GPIO_PORT_SHIFT):
+        {
+          irq = TIVA_IRQ_GPIOT;
+        }
+        break;
+#endif
     }
 
   return irq;
diff --git a/arch/arm/src/tiva/lm/lm3s_gpio.h b/arch/arm/src/tiva/lm/lm3s_gpio.h
index 02acbc8378..1ead238b74 100644
--- a/arch/arm/src/tiva/lm/lm3s_gpio.h
+++ b/arch/arm/src/tiva/lm/lm3s_gpio.h
@@ -114,13 +114,13 @@
 #  undef CONFIG_TIVA_GPIOQ_IRQS
 #endif
 #if TIVA_NPORTS < 16
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOR_IRQS
 #endif
 #if TIVA_NPORTS < 17
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOS_IRQS
 #endif
 #if TIVA_NPORTS < 18
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOT_IRQS
 #endif
 
 /* Bit-encoded input to tiva_configgpio() ***********************************/
diff --git a/arch/arm/src/tiva/lm/lm4f_gpio.h b/arch/arm/src/tiva/lm/lm4f_gpio.h
index 90822d9516..cd82098f17 100644
--- a/arch/arm/src/tiva/lm/lm4f_gpio.h
+++ b/arch/arm/src/tiva/lm/lm4f_gpio.h
@@ -114,13 +114,13 @@
 #  undef CONFIG_TIVA_GPIOQ_IRQS
 #endif
 #if TIVA_NPORTS < 16
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOR_IRQS
 #endif
 #if TIVA_NPORTS < 17
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOS_IRQS
 #endif
 #if TIVA_NPORTS < 18
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOT_IRQS
 #endif
 
 /* Bit-encoded input to tiva_configgpio() ***********************************/
diff --git a/arch/arm/src/tiva/tm4c/tm4c_gpio.h b/arch/arm/src/tiva/tm4c/tm4c_gpio.h
index ff850187d3..583cac1a57 100644
--- a/arch/arm/src/tiva/tm4c/tm4c_gpio.h
+++ b/arch/arm/src/tiva/tm4c/tm4c_gpio.h
@@ -100,13 +100,13 @@
 #  undef CONFIG_TIVA_GPIOQ_IRQS
 #endif
 #if TIVA_NPORTS < 16
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOR_IRQS
 #endif
 #if TIVA_NPORTS < 17
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOS_IRQS
 #endif
 #if TIVA_NPORTS < 18
-#  undef CONFIG_TIVA_GPIOQ_IRQS
+#  undef CONFIG_TIVA_GPIOT_IRQS
 #endif
 
 /* Bit-encoded input to tiva_configgpio() ***********************************/