Patchwork [U-Boot,2/2] tegra: rename FUNCMUX_UART2_UARTB

login
register
mail settings
Submitter Stephen Warren
Date Jan. 22, 2013, 4:20 p.m.
Message ID <1358871608-31858-2-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/214585/
State Accepted
Delegated to: Tom Warren
Headers show

Comments

Stephen Warren - Jan. 22, 2013, 4:20 p.m.
From: Stephen Warren <swarren@nvidia.com>

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>
---
 arch/arm/cpu/tegra-common/board.c           |    4 ++--
 arch/arm/cpu/tegra20-common/funcmux.c       |    2 +-
 arch/arm/include/asm/arch-tegra20/funcmux.h |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
Simon Glass - Jan. 22, 2013, 9:14 p.m.
On Tue, Jan 22, 2013 at 8:20 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> 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>

Patch

diff --git a/arch/arm/cpu/tegra-common/board.c b/arch/arm/cpu/tegra-common/board.c
index 1ec6c06..15ac0c5 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 a1c55a6..80a9bd9 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 963f021..7f15bce 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 */