From: Simon Glass Date: Sat, 5 Nov 2011 04:46:45 +0000 (+0000) Subject: tegra2: Add UARTB support X-Git-Tag: v2012.04-rc1~329^2~21 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1be0d75973eff5a7655f8eb5241661767b97ffd3;p=u-boot tegra2: Add UARTB support UARTB is used on some boards, so support it here. Signed-off-by: Simon Glass Signed-off-by: Tom Warren --- diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 5313c76990..4c29167316 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -38,6 +38,7 @@ DECLARE_GLOBAL_DATA_PTR; enum { /* UARTs which we can enable */ UARTA = 1 << 0, + UARTB = 1 << 1, UARTD = 1 << 3, }; @@ -76,6 +77,8 @@ static void clock_init_uart(int uart_ids) { if (uart_ids & UARTA) enable_uart(PERIPH_ID_UART1); + if (uart_ids & UARTB) + enable_uart(PERIPH_ID_UART2); if (uart_ids & UARTD) enable_uart(PERIPH_ID_UART4); } @@ -92,6 +95,10 @@ static void pin_mux_uart(int uart_ids) pinmux_tristate_disable(PINGRP_IRRX); pinmux_tristate_disable(PINGRP_IRTX); } + if (uart_ids & UARTB) { + pinmux_set_func(PINGRP_UAD, PMUX_FUNC_IRDA); + pinmux_tristate_disable(PINGRP_UAD); + } if (uart_ids & UARTD) { pinmux_set_func(PINGRP_GMC, PMUX_FUNC_UARTD); pinmux_tristate_disable(PINGRP_GMC); @@ -121,6 +128,9 @@ int board_early_init_f(void) #ifdef CONFIG_TEGRA2_ENABLE_UARTA uart_ids |= UARTA; #endif +#ifdef CONFIG_TEGRA2_ENABLE_UARTB + uart_ids |= UARTB; +#endif #ifdef CONFIG_TEGRA2_ENABLE_UARTD uart_ids |= UARTD; #endif