summaryrefslogtreecommitdiff
path: root/board/ti
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2014-06-26 16:38:05 -0500
committerTom Rini <trini@ti.com>2014-07-07 19:42:34 -0400
commit49b633b3d3c49ec91e8f00f0f1bbb34bb32a2269 (patch)
tree551b14c9a64dadd10f5a36956b1e807a47f82c66 /board/ti
parenta8b0f9b685072e1d3acd01741e7db6833b445b2a (diff)
downloadu-boot-imx-49b633b3d3c49ec91e8f00f0f1bbb34bb32a2269.zip
u-boot-imx-49b633b3d3c49ec91e8f00f0f1bbb34bb32a2269.tar.gz
u-boot-imx-49b633b3d3c49ec91e8f00f0f1bbb34bb32a2269.tar.bz2
board: ti: dra7xx: add mux data for UART3
J6 EVM can be built with UART3 as console, but currently there's nothing muxing UART3 correctly. Likely this only works because, based on commit log, author was only testing with UART3 boot and - I assume - ROM code leave UART3 correctly muxed in that case. If we want to boot from MMC and still use UART3 as console, then we need to mux those signals correctly. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'board/ti')
-rw-r--r--board/ti/dra7xx/mux_data.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/board/ti/dra7xx/mux_data.h b/board/ti/dra7xx/mux_data.h
index 38de9d5..c9e202a 100644
--- a/board/ti/dra7xx/mux_data.h
+++ b/board/ti/dra7xx/mux_data.h
@@ -31,10 +31,15 @@ const struct pad_conf_entry core_padconf_array_essential[] = {
{GPMC_A26, (IEN | PTU | PDIS | M1)}, /* mmc2_dat2 */
{GPMC_A27, (IEN | PTU | PDIS | M1)}, /* mmc2_dat3 */
{GPMC_CS1, (IEN | PTU | PDIS | M1)}, /* mmm2_cmd */
+#if (CONFIG_CONS_INDEX == 1)
{UART1_RXD, (FSC | IEN | PTU | PDIS | M0)}, /* UART1_RXD */
{UART1_TXD, (FSC | IEN | PTU | PDIS | M0)}, /* UART1_TXD */
{UART1_CTSN, (IEN | PTU | PDIS | M3)}, /* UART1_CTSN */
{UART1_RTSN, (IEN | PTU | PDIS | M3)}, /* UART1_RTSN */
+#elif (CONFIG_CONS_INDEX == 3)
+ {UART3_RXD, (FSC | IEN | PTU | PDIS | M0)}, /* UART3_RXD */
+ {UART3_TXD, (FSC | IEN | PTU | PDIS | M0)}, /* UART3_TXD */
+#endif
{I2C1_SDA, (IEN | PTU | PDIS | M0)}, /* I2C1_SDA */
{I2C1_SCL, (IEN | PTU | PDIS | M0)}, /* I2C1_SCL */
{MDIO_MCLK, (PTU | PEN | M0)}, /* MDIO_MCLK */