tegra2: Plumb in SPI/UART switch code

On Seaboard the UART and SPI interfere with each other. This causes the UART
to receive spurious zero bytes after SPI transactions and also means that
SPI can corrupt a few output characters when it starts up if they are still
in the UART buffer.

This updates the board to use the SPI/UART switch to avoid the problem.

For now this feature is turned off since it needs changes to the NS16550
UART to operate.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 6a1312c5aae8890e92d093cc40660c54ea3f395b..c3f6796d5d36c2fc423981bc159ea5f6ee78de46 100644 (file)
--- 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 1f57086602408044b7c5fd1c9667fd4ba8e58a3f..80fdcbe07a93f2e2a75ac1f474179b6e42dc3c85 100644 (file)
--- 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 */

diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index 7f2827b8be096f72ee77607a730cfdfe3f7b34d2..0b779f6e9e948e11b81f54e9d64bae726922aa39 100644 (file)
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -31,6 +31,8 @@
 #endif
 #include "../common/board.h"
 
+/* TODO: Remove this code when the SPI switch is working */
+#ifndef CONFIG_SPI_UART_SWITCH
 /*
  * Routine: gpio_config_uart_seaboard
  * Description: Force GPIO_PI3 low on Seaboard so UART4 works.
@@ -48,6 +50,7 @@ void gpio_config_uart(void)
                return;
        gpio_config_uart_seaboard();
 }
+#endif
 
 #ifdef CONFIG_TEGRA2_MMC
 /*