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 /arch/arm/cpu | |
| 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 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm720t/tegra-common/board.h | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm720t/tegra-common/spl.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/cpu/arm720t/tegra-common/board.h b/arch/arm/cpu/arm720t/tegra-common/board.h index 61b91c005f..260767d543 100644 --- a/arch/arm/cpu/arm720t/tegra-common/board.h +++ b/arch/arm/cpu/arm720t/tegra-common/board.h @@ -22,4 +22,4 @@ */ void board_init_uart_f(void); -void gpio_config_uart(void); +void gpio_early_init_uart(void); diff --git a/arch/arm/cpu/arm720t/tegra-common/spl.c b/arch/arm/cpu/arm720t/tegra-common/spl.c index 3139c65128..dfe36b9a4b 100644 --- a/arch/arm/cpu/arm720t/tegra-common/spl.c +++ b/arch/arm/cpu/arm720t/tegra-common/spl.c @@ -63,11 +63,7 @@ void board_init_f(ulong dummy) board_init_uart_f(); /* Initialize periph GPIOs */ -#ifdef CONFIG_SPI_UART_SWITCH gpio_early_init_uart(); -#else - gpio_config_uart(); -#endif /* * We call relocate_code() with relocation target same as the |
