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>

diff --git a/arch/arm/cpu/tegra-common/board.c b/arch/arm/cpu/tegra-common/board.c
index 1ec6c0677d561088b716df275b1121abb9c24af9..15ac0c56f39267860980aed509e060aa0ccfb16f 100644 (file)
--- 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 a1c55a643c939ff7c47a6031930249f0888c3c34..80a9bd9e28463edf774a783387769371ff341f15 100644 (file)
--- 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 963f021f12a656b61230cda86a228548fc1f95c5..7f15bceafaa74840a92736c9a63b18e4f0bf1488 100644 (file)
--- 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 */