diff mbox

[U-Boot] board: ti: dra7xx: add mux data for UART3

Message ID 1403818685-22541-1-git-send-email-balbi@ti.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Felipe Balbi June 26, 2014, 9:38 p.m. UTC 
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>
---
 board/ti/dra7xx/mux_data.h | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Tom Rini July 8, 2014, 1:37 a.m. UTC | #1 
On Thu, Jun 26, 2014 at 04:38:05PM -0500, Felipe Balbi wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

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  */