diff options
Diffstat (limited to 'board/nvidia/common')
| -rw-r--r-- | board/nvidia/common/board.c | 8 | ||||
| -rw-r--r-- | board/nvidia/common/board.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 6a1312c5aae..c3f6796d5d3 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -112,9 +112,13 @@ static void pin_mux_uart(int uart_ids) */ int board_init(void) { + /* Do clocks and UART first so that printf() works */ clock_init(); clock_verify(); +#ifdef CONFIG_SPI_UART_SWITCH + gpio_config_uart(); +#endif #ifdef CONFIG_TEGRA2_SPI spi_init(); #endif @@ -152,7 +156,11 @@ int board_early_init_f(void) pin_mux_uart(uart_ids); /* Initialize periph GPIOs */ +#ifdef CONFIG_SPI_UART_SWITCH + gpio_early_init_uart(); +#else gpio_config_uart(); +#endif return 0; } #endif /* EARLY_INIT */ diff --git a/board/nvidia/common/board.h b/board/nvidia/common/board.h index 1f570866024..80fdcbe07a9 100644 --- a/board/nvidia/common/board.h +++ b/board/nvidia/common/board.h @@ -26,5 +26,6 @@ void gpio_config_uart(void); int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio); +void gpio_early_init_uart(void); #endif /* BOARD_H */ |