diff options
| author | Stephen Warren <swarren@nvidia.com> | 2014-04-22 14:37:52 -0600 |
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2014-05-13 10:41:31 -0700 |
| commit | 4a68d3431ace189746ffb498dc9e844296626615 (patch) | |
| tree | ff144701376db234d63f06087b9d691b2d67e74a /arch/arm/cpu/tegra-common | |
| parent | 48ec7a946815e984f20b9478edfe46d4b08484c7 (diff) | |
ARM: tegra: allow pinmux mux option not to be set by init tables
Define enum PMUX_FUNC_DEFAULT, which indicates that a table entry passed
to pinmux_config_pingrp()/pinmux_config_pingrp_table() shouldn't change
the mux option in HW.
For pins that will be used as GPIOs, the mux option is irrelevant, so we
simply don't want to define any mux option in the pinmux initialization
table.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'arch/arm/cpu/tegra-common')
| -rw-r--r-- | arch/arm/cpu/tegra-common/pinmux-common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/cpu/tegra-common/pinmux-common.c b/arch/arm/cpu/tegra-common/pinmux-common.c index d62618cd0f..6d7a7d907b 100644 --- a/arch/arm/cpu/tegra-common/pinmux-common.c +++ b/arch/arm/cpu/tegra-common/pinmux-common.c @@ -92,6 +92,9 @@ void pinmux_set_func(enum pmux_pingrp pin, enum pmux_func func) int i, mux = -1; u32 val; + if (func == PMUX_FUNC_DEFAULT) + return; + /* Error check on pin and func */ assert(pmux_pingrp_isvalid(pin)); assert(pmux_func_isvalid(func)); |