From b9dcced1aa6058c19c992a05f3cee3356b5e8ced Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 12 Jan 2015 09:59:58 -0600
Subject: [PATCH] Tiva interrupts: Fix chip-specific interrupt un-definitions

---
 arch/arm/include/tiva/irq.h | 43 +++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/arch/arm/include/tiva/irq.h b/arch/arm/include/tiva/irq.h
index f3764eb3c3..7606f7abb2 100644
--- a/arch/arm/include/tiva/irq.h
+++ b/arch/arm/include/tiva/irq.h
@@ -58,22 +58,47 @@
 
 #elif defined(CONFIG_ARCH_CHIP_TM4C)
 
-/* The TM4C123x and TM4C129x support interrupts only on ports P and Q. */
+/* The TM4C123GH6PMI supports ports A-F of which any can support interrupts */
 
-#  undef CONFIG_TIVA_GPIOA_IRQS
-#  undef CONFIG_TIVA_GPIOB_IRQS
-#  undef CONFIG_TIVA_GPIOC_IRQS
-#  undef CONFIG_TIVA_GPIOD_IRQS
-#  undef CONFIG_TIVA_GPIOE_IRQS
-#  undef CONFIG_TIVA_GPIOF_IRQS
-#  undef CONFIG_TIVA_GPIOG_IRQS
+#  if defined(CONFIG_ARCH_CHIP_TM4C123GH6PMI)
+#    undef CONFIG_TIVA_GPIOP_IRQS /* P-Q */
+#    undef CONFIG_TIVA_GPIOQ_IRQS
+
+/* The TM4C123GH6PGE supports interrupts on port P */
+
+#  elif defined(CONFIG_ARCH_CHIP_TM4C123GH6PGE)
+#    undef CONFIG_TIVA_GPIOA_IRQS /* A-F */
+#    undef CONFIG_TIVA_GPIOB_IRQS
+#    undef CONFIG_TIVA_GPIOC_IRQS
+#    undef CONFIG_TIVA_GPIOD_IRQS
+#    undef CONFIG_TIVA_GPIOE_IRQS
+#    undef CONFIG_TIVA_GPIOF_IRQS
+
+#    undef CONFIG_TIVA_GPIOQ_IRQS /* Q */
+
+/* The TM4C123GH6ZRB  and the TM4C129x support interrupts only on ports P and Q. */
+
+#  else
+#    undef CONFIG_TIVA_GPIOA_IRQS /* A-F */
+#    undef CONFIG_TIVA_GPIOB_IRQS
+#    undef CONFIG_TIVA_GPIOC_IRQS
+#    undef CONFIG_TIVA_GPIOD_IRQS
+#    undef CONFIG_TIVA_GPIOE_IRQS
+#    undef CONFIG_TIVA_GPIOF_IRQS
+
+#  endif
+
+/* No supported architecture supports interrupts on ports G-N or R-T */
+
+#  undef CONFIG_TIVA_GPIOG_IRQS /* G-N */
 #  undef CONFIG_TIVA_GPIOH_IRQS
 #  undef CONFIG_TIVA_GPIOJ_IRQS
 #  undef CONFIG_TIVA_GPIOK_IRQS
 #  undef CONFIG_TIVA_GPIOL_IRQS
 #  undef CONFIG_TIVA_GPIOM_IRQS
 #  undef CONFIG_TIVA_GPION_IRQS
-#  undef CONFIG_TIVA_GPIOR_IRQS
+
+#  undef CONFIG_TIVA_GPIOR_IRQS /* R-T */
 #  undef CONFIG_TIVA_GPIOS_IRQS
 #  undef CONFIG_TIVA_GPIOT_IRQS