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

tegra: rename FUNCMUX_UART2_UARTB

Browse Source 
FUNCMUX_ defines should be named after the pin groups they affect, not
after the module they're muxing onto those pin groups.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Stephen Warren 2013-01-22 06:20:08 +00:00 committed by Tom Warren
parent f29f086a09
commit 4727a13bde
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/tegra-common/board.c
View File

@ -112,8 +112,8 @@ static int uart_configs[] = {
FUNCMUX_UART1_SDIO1, FUNCMUX_UART1_SDIO1,
#else #else
FUNCMUX_UART1_IRRX_IRTX, FUNCMUX_UART1_IRRX_IRTX,
#endif #endif
FUNCMUX_UART2_UARTB, FUNCMUX_UART2_UAD,
-1, -1,
FUNCMUX_UART4_GMC, FUNCMUX_UART4_GMC,
-1, -1,

2
arch/arm/cpu/tegra20-common/funcmux.c
View File

@ -98,7 +98,7 @@ int funcmux_select(enum periph_id id, int config)
break; break;
case PERIPH_ID_UART2: case PERIPH_ID_UART2:
if (config == FUNCMUX_UART2_UARTB) { if (config == FUNCMUX_UART2_UAD) {
pinmux_set_func(PINGRP_UAD, PMUX_FUNC_UARTB); pinmux_set_func(PINGRP_UAD, PMUX_FUNC_UARTB);
pinmux_tristate_disable(PINGRP_UAD); pinmux_tristate_disable(PINGRP_UAD);
} }

2
arch/arm/include/asm/arch-tegra20/funcmux.h
View File

@ -35,7 +35,7 @@ enum {
FUNCMUX_UART1_UAA_UAB, FUNCMUX_UART1_UAA_UAB,
FUNCMUX_UART1_GPU, FUNCMUX_UART1_GPU,
FUNCMUX_UART1_SDIO1, FUNCMUX_UART1_SDIO1,
FUNCMUX_UART2_UARTB = 0, FUNCMUX_UART2_UAD = 0,
FUNCMUX_UART4_GMC = 0, FUNCMUX_UART4_GMC = 0,
/* I2C configs */ /* I2C configs */