summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-tegra20
diff options
context:
space:
mode:
authorAllen Martin <amartin@nvidia.com>2013-01-09 10:52:23 +0000
committerTom Warren <twarren@nvidia.com>2013-01-16 13:40:08 -0700
commitd08b9e9c7e22c205075d16eec42f452b1daae277 (patch)
tree7149104dca572f4228d1a4adaceea1abdb6f1883 /arch/arm/include/asm/arch-tegra20
parentbb1e7cde624d44edf75c1b607fd6c60e038f98dd (diff)
downloadu-boot-imx-d08b9e9c7e22c205075d16eec42f452b1daae277.zip
u-boot-imx-d08b9e9c7e22c205075d16eec42f452b1daae277.tar.gz
u-boot-imx-d08b9e9c7e22c205075d16eec42f452b1daae277.tar.bz2
tegra: remove IRDA pinmux synonym
IRDA is a synonym for UARTB in tegra pinmux, remove all usage of this synonym and replace with UARTB to disambiguate. Signed-off-by: Allen Martin <amartin@nvidia.com> Reviewed-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'arch/arm/include/asm/arch-tegra20')
-rw-r--r--arch/arm/include/asm/arch-tegra20/funcmux.h2
-rw-r--r--arch/arm/include/asm/arch-tegra20/pinmux.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-tegra20/funcmux.h b/arch/arm/include/asm/arch-tegra20/funcmux.h
index 1bac25e..963f021 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_IRDA = 0,
+ FUNCMUX_UART2_UARTB = 0,
FUNCMUX_UART4_GMC = 0,
/* I2C configs */
diff --git a/arch/arm/include/asm/arch-tegra20/pinmux.h b/arch/arm/include/asm/arch-tegra20/pinmux.h
index 797e158..a9b4eda 100644
--- a/arch/arm/include/asm/arch-tegra20/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra20/pinmux.h
@@ -204,7 +204,6 @@ enum pmux_func {
PMUX_FUNC_I2C2,
PMUX_FUNC_I2C3,
PMUX_FUNC_IDE,
- PMUX_FUNC_IRDA,
PMUX_FUNC_KBC,
PMUX_FUNC_MIO,
PMUX_FUNC_MIPI_HS,