From 0cd10c7abf3d210c921a0e5c86c2abdbf98c68c5 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Tue, 25 Sep 2012 20:21:14 +0000 Subject: 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 Acked-by: Simon Glass Signed-off-by: Tom Warren --- arch/arm/cpu/arm720t/tegra-common/board.h | 2 +- arch/arm/cpu/arm720t/tegra-common/spl.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'arch/arm/cpu/arm720t') diff --git a/arch/arm/cpu/arm720t/tegra-common/board.h b/arch/arm/cpu/arm720t/tegra-common/board.h index 61b91c0..260767d 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 3139c65..dfe36b9 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 -- cgit v1.1