summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-01-22 06:20:08 +0000
committerTom Warren <twarren@nvidia.com>2013-02-11 10:35:24 -0700
commit4727a13bde609c22e4152bf13400547acaad29fa (patch)
tree4fa760214c014834b0304bcc0aa5a584804e9c75 /arch/arm
parentf29f086a098a8462f8b375da0509246843f7fdd1 (diff)
downloadtalos-obmc-uboot-4727a13bde609c22e4152bf13400547acaad29fa.tar.gz
talos-obmc-uboot-4727a13bde609c22e4152bf13400547acaad29fa.zip
tegra: rename FUNCMUX_UART2_UARTB
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/tegra-common/board.c4
-rw-r--r--arch/arm/cpu/tegra20-common/funcmux.c2
-rw-r--r--arch/arm/include/asm/arch-tegra20/funcmux.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/tegra-common/board.c b/arch/arm/cpu/tegra-common/board.c
index 1ec6c0677d..15ac0c56f3 100644
--- a/arch/arm/cpu/tegra-common/board.c
+++ b/arch/arm/cpu/tegra-common/board.c
@@ -112,8 +112,8 @@ static int uart_configs[] = {
FUNCMUX_UART1_SDIO1,
#else
FUNCMUX_UART1_IRRX_IRTX,
- #endif
- FUNCMUX_UART2_UARTB,
+#endif
+ FUNCMUX_UART2_UAD,
-1,
FUNCMUX_UART4_GMC,
-1,
diff --git a/arch/arm/cpu/tegra20-common/funcmux.c b/arch/arm/cpu/tegra20-common/funcmux.c
index a1c55a643c..80a9bd9e28 100644
--- a/arch/arm/cpu/tegra20-common/funcmux.c
+++ b/arch/arm/cpu/tegra20-common/funcmux.c
@@ -98,7 +98,7 @@ int funcmux_select(enum periph_id id, int config)
break;
case PERIPH_ID_UART2:
- if (config == FUNCMUX_UART2_UARTB) {
+ if (config == FUNCMUX_UART2_UAD) {
pinmux_set_func(PINGRP_UAD, PMUX_FUNC_UARTB);
pinmux_tristate_disable(PINGRP_UAD);
}
diff --git a/arch/arm/include/asm/arch-tegra20/funcmux.h b/arch/arm/include/asm/arch-tegra20/funcmux.h
index 963f021f12..7f15bceafa 100644
--- a/arch/arm/include/asm/arch-tegra20/funcmux.h
+++ b/arch/arm/include/asm/arch-tegra20/funcmux.h
@@ -35,7 +35,7 @@ enum {
FUNCMUX_UART1_UAA_UAB,
FUNCMUX_UART1_GPU,
FUNCMUX_UART1_SDIO1,
- FUNCMUX_UART2_UARTB = 0,
+ FUNCMUX_UART2_UAD = 0,
FUNCMUX_UART4_GMC = 0,
/* I2C configs */
OpenPOWER on IntegriCloud