Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 07:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

tegra: remove IRDA pinmux synonym

Browse source 
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>
This commit is contained in:
Allen Martin 2013-01-09 10:52:23 +00:00 committed by Tom Warren
parent bb1e7cde62
commit d08b9e9c7e
7 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/tegra-common/board.c
View file

@ -113,7 +113,7 @@ static int uart_configs[] = {
#else #else
FUNCMUX_UART1_IRRX_IRTX, FUNCMUX_UART1_IRRX_IRTX,
#endif #endif
FUNCMUX_UART2_IRDA, FUNCMUX_UART2_UARTB,
-1, -1,
FUNCMUX_UART4_GMC, FUNCMUX_UART4_GMC,
-1, -1,

4
arch/arm/cpu/tegra20-common/funcmux.c
View file

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

2
arch/arm/cpu/tegra20-common/pinmux.c
View file

@ -390,7 +390,7 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = {
PIN(UAA, BB, SPI3, MIPI_HS, UARTA, ULPI, MIPI_HS), PIN(UAA, BB, SPI3, MIPI_HS, UARTA, ULPI, MIPI_HS),
PIN(UAB, BB, SPI2, MIPI_HS, UARTA, ULPI, MIPI_HS), PIN(UAB, BB, SPI2, MIPI_HS, UARTA, ULPI, MIPI_HS),
PIN(UAC, BB, OWR, RSVD, RSVD, RSVD, RSVD4), PIN(UAC, BB, OWR, RSVD, RSVD, RSVD, RSVD4),
PIN(UAD, UART, IRDA, SPDIF, UARTA, SPI4, SPDIF), PIN(UAD, UART, UARTB, SPDIF, UARTA, SPI4, SPDIF),
PIN(UCA, UART, UARTC, RSVD, GMI, RSVD, RSVD4), PIN(UCA, UART, UARTC, RSVD, GMI, RSVD, RSVD4),
PIN(UCB, UART, UARTC, PWM, GMI, RSVD, RSVD4), PIN(UCB, UART, UARTC, PWM, GMI, RSVD, RSVD4),

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_IRDA = 0, FUNCMUX_UART2_UARTB = 0,
FUNCMUX_UART4_GMC = 0, FUNCMUX_UART4_GMC = 0,
/* I2C configs */ /* I2C configs */

1
arch/arm/include/asm/arch-tegra20/pinmux.h
View file

@ -204,7 +204,6 @@ enum pmux_func {
PMUX_FUNC_I2C2, PMUX_FUNC_I2C2,
PMUX_FUNC_I2C3, PMUX_FUNC_I2C3,
PMUX_FUNC_IDE, PMUX_FUNC_IDE,
PMUX_FUNC_IRDA,
PMUX_FUNC_KBC, PMUX_FUNC_KBC,
PMUX_FUNC_MIO, PMUX_FUNC_MIO,
PMUX_FUNC_MIPI_HS, PMUX_FUNC_MIPI_HS,

1
arch/arm/include/asm/arch-tegra30/pinmux.h
View file

@ -349,7 +349,6 @@ enum pmux_func {
PMUX_FUNC_I2C2, PMUX_FUNC_I2C2,
PMUX_FUNC_I2C3, PMUX_FUNC_I2C3,
PMUX_FUNC_IDE, PMUX_FUNC_IDE,
PMUX_FUNC_IRDA,
PMUX_FUNC_KBC, PMUX_FUNC_KBC,
PMUX_FUNC_MIO, PMUX_FUNC_MIO,
PMUX_FUNC_MIPI_HS, PMUX_FUNC_MIPI_HS,

4
board/nvidia/cardhu/pinmux-config-cardhu.h
View file

@ -176,8 +176,8 @@ static struct pingroup_config tegra3_pinmux_common[] = {
LV_PINMUX(VI_D7, SDMMC2, NORMAL, NORMAL, INPUT, DISABLE, DISABLE), LV_PINMUX(VI_D7, SDMMC2, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
LV_PINMUX(VI_D10, RSVD1, NORMAL, NORMAL, INPUT, DISABLE, DISABLE), LV_PINMUX(VI_D10, RSVD1, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
LV_PINMUX(VI_MCLK, VI, UP, NORMAL, INPUT, DISABLE, DISABLE), LV_PINMUX(VI_MCLK, VI, UP, NORMAL, INPUT, DISABLE, DISABLE),
DEFAULT_PINMUX(UART2_RXD, IRDA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART2_RXD, UARTB, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(UART2_TXD, IRDA, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(UART2_TXD, UARTB, NORMAL, NORMAL, OUTPUT),
DEFAULT_PINMUX(UART2_RTS_N, UARTB, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(UART2_RTS_N, UARTB, NORMAL, NORMAL, OUTPUT),
DEFAULT_PINMUX(UART2_CTS_N, UARTB, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART2_CTS_N, UARTB, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(UART3_TXD, UARTC, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(UART3_TXD, UARTC, NORMAL, NORMAL, OUTPUT),