tegra: sync SDIO1 pingroup enum name with TRM
Subsystems (2)
PATCH 1/2 tegra: sync SDIO1 pingroup enum name with TRM
Signed-off-by Lucas Stach <[email protected]>
CC Tom Warren <[email protected]>
--- arch/arm/include/asm/arch-tegra2/pinmux.h | 2 +- board/compal/paz00/paz00.c | 6 +++---
2 Dateien ge?ndert, 4 Zeilen hinzugef?gt(+), 4 Zeilen entfernt(-)
arch/arm/include/asm/arch-tegra2/pinmux.h +1 -1
@@ -67,7 +67,7 @@ enum pmux_pingrp {PINGRP_KBCF ,PINGRP_GMA ,PINGRP_GMC , -PINGRP_SDMMC1 , +PINGRP_SDIO1 , PINGRP_OWC,/* 32: APB_MISC_PP_TRISTATE_REG_B_0 */
board/compal/paz00/paz00.c +3 -3
@@ -48,10 +48,10 @@ static void pin_mux_mmc(void)pinmux_tristate_disable (PINGRP_GMA );pinmux_tristate_disable (PINGRP_GME ); -/* SDMMC1: SDIO1_CLK, SDIO1_CMD, SDIO1_DAT[3:0] */ -pinmux_set_func (PINGRP_SDMMC1 ,PMUX_FUNC_SDIO1 ); +/* SDIO1: SDIO1_CLK, SDIO1_CMD, SDIO1_DAT[3:0] */ +pinmux_set_func (PINGRP_SDIO1 ,PMUX_FUNC_SDIO1 ); -pinmux_tristate_disable (PINGRP_SDMMC1 ); +pinmux_tristate_disable (PINGRP_SDIO1 );/* For power GPIO PV1 */ pinmux_tristate_disable (PINGRP_UAC );
Signature · 1 line
1.7.10.1
PATCH 2/2 tegra: add SDIO1 funcmux entry for UARTA
This is based on top of:
tegra: add alternate UART1 funcmux entry
tegra: add UART1 on GPU funcmux entry
v2: remove enum change
Signed-off-by Lucas Stach <[email protected]>
Acked-by Stephen Warren <[email protected]>
CC Stephen Warren <[email protected]>
CC Tom Warren <[email protected]>
CC Marek Vasut <[email protected]>
--- arch/arm/cpu/armv7/tegra2/board.c | 2 ++ arch/arm/cpu/armv7/tegra2/funcmux.c | 5 +++++ arch/arm/include/asm/arch-tegra2/funcmux.h | 1 +
3 Dateien ge?ndert, 8 Zeilen hinzugef?gt(+)
arch/arm/cpu/armv7/tegra2/board.c +2 -0
@@ -125,6 +125,8 @@ static int uart_configs[] = { FUNCMUX_UART1_UAA_UAB,#elif defined(CONFIG_TEGRA2_UARTA_GPU ) FUNCMUX_UART1_GPU, +#elif defined(CONFIG_TEGRA2_UARTA_SDIO1 ) + FUNCMUX_UART1_SDIO1, #else FUNCMUX_UART1_IRRX_IRTX,#endif
arch/arm/cpu/armv7/tegra2/funcmux.c +5 -0
@@ -50,6 +50,11 @@ int funcmux_select(enum periph_id id, int config)pinmux_tristate_disable (PINGRP_GPU ); bad_config =0 ;break ; +case FUNCMUX_UART1_SDIO1 : +pinmux_set_func (PINGRP_SDIO1 ,PMUX_FUNC_UARTA ); +pinmux_tristate_disable (PINGRP_SDIO1 ); + bad_config =0 ; +break ; }if (!bad_config) {/*
arch/arm/include/asm/arch-tegra2/funcmux.h +1 -0
@@ -32,6 +32,7 @@ enum {FUNCMUX_UART1_IRRX_IRTX =0 ,FUNCMUX_UART1_UAA_UAB ,FUNCMUX_UART1_GPU , +FUNCMUX_UART1_SDIO1 ,FUNCMUX_UART2_IRDA =0 , FUNCMUX_UART4_GMC = 0,
Signature · 1 line
1.7.10.1