summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-01-12 09:59:58 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-01-12 10:00:42 -0600
commit3e2812c14422da36153cdd4a16a5c38b72600563 (patch)
tree58d79034d74d42b3526588676d60033da4071350
parent5d5ffcffae3932ac26c70902eb6c613aadf50009 (diff)
downloadnuttx-3e2812c14422da36153cdd4a16a5c38b72600563.tar.gz
nuttx-3e2812c14422da36153cdd4a16a5c38b72600563.tar.bz2
nuttx-3e2812c14422da36153cdd4a16a5c38b72600563.zip
Tiva interrupts: Fix chip-specific interrupt un-definitions
-rw-r--r--nuttx/arch/arm/include/tiva/irq.h43
1 files changed, 34 insertions, 9 deletions
diff --git a/nuttx/arch/arm/include/tiva/irq.h b/nuttx/arch/arm/include/tiva/irq.h
index f3764eb3c..7606f7abb 100644
--- a/nuttx/arch/arm/include/tiva/irq.h
+++ b/nuttx/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