minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-17 16:07:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

tegra: add UART1 on GPU funcmux entry

Browse Source 
TrimSlice uses UART1 on the GPU pingroup.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Stephen Warren 2012-05-16 05:59:59 +00:00 committed by Albert ARIBAUD
parent defd5e4979
commit e21649be56
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/armv7/tegra2/board.c
View File

@ -102,8 +102,10 @@ int arch_cpu_init(void)
#endif #endif
static int uart_configs[] = { static int uart_configs[] = {
#ifdef CONFIG_TEGRA2_UARTA_UAA_UAB #if defined(CONFIG_TEGRA2_UARTA_UAA_UAB)
FUNCMUX_UART1_UAA_UAB, FUNCMUX_UART1_UAA_UAB,
#elif defined(CONFIG_TEGRA2_UARTA_GPU)
FUNCMUX_UART1_GPU,
#else #else
FUNCMUX_UART1_IRRX_IRTX, FUNCMUX_UART1_IRRX_IRTX,
#endif #endif

5
arch/arm/cpu/armv7/tegra2/funcmux.c
View File

@ -45,6 +45,11 @@ int funcmux_select(enum periph_id id, int config)
pinmux_tristate_disable(PINGRP_UAB); pinmux_tristate_disable(PINGRP_UAB);
bad_config = 0; bad_config = 0;
break; break;
case FUNCMUX_UART1_GPU:
pinmux_set_func(PINGRP_GPU, PMUX_FUNC_UARTA);
pinmux_tristate_disable(PINGRP_GPU);
bad_config = 0;
break;
} }
if (!bad_config) { if (!bad_config) {
/* /*

1
arch/arm/include/asm/arch-tegra2/funcmux.h
View File

@ -31,6 +31,7 @@ enum {
/* UART configs */ /* UART configs */
FUNCMUX_UART1_IRRX_IRTX = 0, FUNCMUX_UART1_IRRX_IRTX = 0,
FUNCMUX_UART1_UAA_UAB, FUNCMUX_UART1_UAA_UAB,
FUNCMUX_UART1_GPU,
FUNCMUX_UART2_IRDA = 0, FUNCMUX_UART2_IRDA = 0,
FUNCMUX_UART4_GMC = 0, FUNCMUX_UART4_GMC = 0,