diff options
| author | Lucas Stach <dev@lynxeye.de> | 2012-09-25 20:21:14 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:54:07 -0700 |
| commit | 0cd10c7abf3d210c921a0e5c86c2abdbf98c68c5 (patch) | |
| tree | bf393f294d59bb593f7139834ef00ca2b3324d8a /board/nvidia/common | |
| parent | 65530a842eeaf7ad07e0613ac6f883f2f1f1e33f (diff) | |
| download | talos-obmc-uboot-0cd10c7abf3d210c921a0e5c86c2abdbf98c68c5.tar.gz talos-obmc-uboot-0cd10c7abf3d210c921a0e5c86c2abdbf98c68c5.zip | |
tegra20: rework UART GPIO handling
Rename board provided gpio_config_uart() to
gpio_early_init_uart() as it does the same thing as the equally
called function provided by the uart-switch code. This allows
to simply call this function in early board init whether or not
we are building with CONFIG_UART_SWITCH defined.
Also provide a weak symbol for this function, to avoid the
need to provide this function for boards that don't need any
fixup.
This patch supersedes the earlier posted
"tegra: convert gpio_config_uart to weak symbol".
Build tested with MAKEALL -s tegra20
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'board/nvidia/common')
| -rw-r--r-- | board/nvidia/common/board.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 8821fdfeba..bd194bc966 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -71,6 +71,13 @@ void __pin_mux_spi(void) void pin_mux_spi(void) __attribute__((weak, alias("__pin_mux_spi"))); +void __gpio_early_init_uart(void) +{ +} + +void gpio_early_init_uart(void) +__attribute__((weak, alias("__gpio_early_init_uart"))); + /* * Routine: power_det_init * Description: turn off power detects @@ -155,11 +162,8 @@ int board_early_init_f(void) /* Initialize periph GPIOs */ gpio_early_init(); -#ifdef CONFIG_SPI_UART_SWITCH gpio_early_init_uart(); -#else - gpio_config_uart(); -#endif + return 0; } #endif /* EARLY_INIT */ |
