diff options
| author | Simon Glass <sjg@chromium.org> | 2012-01-11 12:42:22 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-02-12 10:11:22 +0100 |
| commit | d693969daa961d77c9f68e6868866509522eeb97 (patch) | |
| tree | 959ff8e2f6d50f7c03696aa74dd400baa4d01677 /arch/arm/include/asm/arch-tegra2 | |
| parent | 2996e2dcc0454207b4bf6248d034aead4ac54591 (diff) | |
| download | talos-obmc-uboot-d693969daa961d77c9f68e6868866509522eeb97.tar.gz talos-obmc-uboot-d693969daa961d77c9f68e6868866509522eeb97.zip | |
tegra: Adjust funcmux config test to permit expansion
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>
Diffstat (limited to 'arch/arm/include/asm/arch-tegra2')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/funcmux.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-tegra2/funcmux.h b/arch/arm/include/asm/arch-tegra2/funcmux.h index 2d724a2872..d4f9cfbd06 100644 --- a/arch/arm/include/asm/arch-tegra2/funcmux.h +++ b/arch/arm/include/asm/arch-tegra2/funcmux.h @@ -32,6 +32,9 @@ * The basic config is 0, and higher numbers indicate different * 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 config Configuration to use (generally 0) * @return 0 if ok, -1 on error (e.g. incorrect id or config) |
