summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-01-01 14:16:05 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-01-01 14:16:05 -0600
commit82b8d60cd06bb2bd1540bec907b36f090a8ea0ce (patch)
tree964186a1f8d97fd8d7fb099c1aa150a30d443111
parentd87853dac53ee622f11697676be689b28d81a4cf (diff)
downloadnuttx-82b8d60cd06bb2bd1540bec907b36f090a8ea0ce.tar.gz
nuttx-82b8d60cd06bb2bd1540bec907b36f090a8ea0ce.tar.bz2
nuttx-82b8d60cd06bb2bd1540bec907b36f090a8ea0ce.zip
DK_TM4C129X: Add more GPIO pin definitions
-rw-r--r--nuttx/configs/dk-tm4c129x/include/board.h11
-rw-r--r--nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h16
2 files changed, 20 insertions, 7 deletions
diff --git a/nuttx/configs/dk-tm4c129x/include/board.h b/nuttx/configs/dk-tm4c129x/include/board.h
index b9f23ac76..e147d1d85 100644
--- a/nuttx/configs/dk-tm4c129x/include/board.h
+++ b/nuttx/configs/dk-tm4c129x/include/board.h
@@ -158,9 +158,18 @@
/* Pin Multiplexing Disambiguation **************************************************/
/* UARTs
*
- * UART0: PA0, PA1 (fixed configuration)
+ * UART0: PA0-1 (fixed configuration)
+ * UART3: PJ0-1 to EM_TX/EM_RX or BOOSTER_PACK2_RX/BOOSTER_PACK2_TX(Depending
+ * on J12/J13)
+ * UART5: PH6-7 to BOOSTER_PACK1_RX/BOOSTER_PACK1_TX
*/
+#define GPIO_UART3_RX GPIO_UART3_RX_2
+#define GPIO_UART3_TX GPIO_UART3_TX_2
+
+#define GPIO_UART5_RX GPIO_UART5_RX_2
+#define GPIO_UART5_TX GPIO_UART5_TX_2
+
/* SSI:
*
* SSI0: PA2-5 are used for SSI0 to the second booster pack (fixed configuration)
diff --git a/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h b/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
index 148b56981..5fb9f5337 100644
--- a/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
+++ b/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
@@ -101,14 +101,18 @@
#define IRQ_SW4 TIVA_IRQ_GPIOP_1
/* SPI Chip selects ****************************************************************/
-/* SSI0: PA3 is used for SSI0 chip select to the second booster pack
- * SSI3: PH4 selects the SD card and PQ1 selects the on-board SPI flash.
+/* SSI0: PA3 is used for SSI0 chip select to the second booster pack (No pull-
+* ups)
+ * SSI3: PH4 selects the SD card and PQ1 selects the on-board SPI flash. Both
+ * pulled up on board.
*/
-#define GPIO_BSTR_CS (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
- GPIO_VALUE_ONE | GPIO_PORTA | GPIO_PIN_3)
-#define GPIO_SD_CS (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
- GPIO_VALUE_ONE | GPIO_PORTH | GPIO_PIN_4)
+#define GPIO_BSTR2_CS (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
+ GPIO_VALUE_ONE | GPIO_PORTA | GPIO_PIN_3)
+#define GPIO_FLASH_CS (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STD | GPIO_STRENGTH_4MA | \
+ GPIO_VALUE_ONE | GPIO_PORTH | GPIO_PIN_4)
+#define GPIO_SD_CS (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STD | GPIO_STRENGTH_4MA | \
+ GPIO_VALUE_ONE | GPIO_PORTH | GPIO_PIN_4)
/* Speaker outputs *****************************************************************/
/* PB2/PD4 are used for the speaker output */