mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-29 06:31:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

tegra: Adjust funcmux config test to permit expansion

Browse Source 
We want to support config options other than zero, so move the test to the
end to allow intermediate code to OK such a config.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Simon Glass 2012-01-11 12:42:22 +00:00 committed by Albert ARIBAUD
parent 2996e2dcc0
commit d693969daa
2 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/cpu/armv7/tegra2/funcmux.c
View File

@ -26,39 +26,43 @@
int funcmux_select(enum periph_id id, int config) int funcmux_select(enum periph_id id, int config)
{ {
if (config != 0) { int bad_config = config != 0;
debug("%s: invalid config %d for periph_id %d", __func__,
config, id);
return -1;
}
switch (id) { switch (id) {
case PERIPH_ID_UART1: case PERIPH_ID_UART1:
if (config == 0) {
pinmux_set_func(PINGRP_IRRX, PMUX_FUNC_UARTA); pinmux_set_func(PINGRP_IRRX, PMUX_FUNC_UARTA);
pinmux_set_func(PINGRP_IRTX, PMUX_FUNC_UARTA); pinmux_set_func(PINGRP_IRTX, PMUX_FUNC_UARTA);
pinmux_tristate_disable(PINGRP_IRRX); pinmux_tristate_disable(PINGRP_IRRX);
pinmux_tristate_disable(PINGRP_IRTX); pinmux_tristate_disable(PINGRP_IRTX);
/* /*
* Tegra appears to boot with function UARTA pre-selected on * Tegra appears to boot with function UARTA pre-
* mux group SDB. If two mux groups are both set to the same * selected on mux group SDB. If two mux groups are
* function, it's unclear which group's pins drive the RX * both set to the same function, it's unclear which
* signals into the HW module. For UARTA, SDB certainly * group's pins drive the RX signals into the HW.
* overrides group IRTX in practice. To solve this, configure * For UARTA, SDB certainly overrides group IRTX in
* some alternative function on SDB to avoid the conflict. Also, * practice. To solve this, configure some alternative
* tri-state the group to avoid driving any signal onto it until * function on SDB to avoid the conflict. Also, tri-
* we know what's connected. * state the group to avoid driving any signal onto it
* until we know what's connected.
*/ */
pinmux_tristate_enable(PINGRP_SDB); pinmux_tristate_enable(PINGRP_SDB);
pinmux_set_func(PINGRP_SDB, PMUX_FUNC_SDIO3); pinmux_set_func(PINGRP_SDB, PMUX_FUNC_SDIO3);
}
break; break;
case PERIPH_ID_UART2: case PERIPH_ID_UART2:
if (config == 0) {
pinmux_set_func(PINGRP_UAD, PMUX_FUNC_IRDA); pinmux_set_func(PINGRP_UAD, PMUX_FUNC_IRDA);
pinmux_tristate_disable(PINGRP_UAD); pinmux_tristate_disable(PINGRP_UAD);
}
break; break;
case PERIPH_ID_UART4: case PERIPH_ID_UART4:
if (config == 0) {
pinmux_set_func(PINGRP_GMC, PMUX_FUNC_UARTD); pinmux_set_func(PINGRP_GMC, PMUX_FUNC_UARTD);
pinmux_tristate_disable(PINGRP_GMC); pinmux_tristate_disable(PINGRP_GMC);
}
break; break;
default: default:
@ -66,5 +70,11 @@ int funcmux_select(enum periph_id id, int config)
return -1; return -1;
} }
if (bad_config) {
debug("%s: invalid config %d for periph_id %d", __func__,
config, id);
return -1;
}
return 0; return 0;
} }

3
arch/arm/include/asm/arch-tegra2/funcmux.h
View File

@ -32,6 +32,9 @@
* The basic config is 0, and higher numbers indicate different * The basic config is 0, and higher numbers indicate different
* pinmux settings to bring the peripheral out on other pins, * pinmux settings to bring the peripheral out on other pins,
* *
* This function also disables tristate for the function's pins,
* so that they operate in normal mode.
*
* @param id Peripheral id * @param id Peripheral id
* @param config Configuration to use (generally 0) * @param config Configuration to use (generally 0)
* @return 0 if ok, -1 on error (e.g. incorrect id or config) * @return 0 if ok, -1 on error (e.g. incorrect id or config)