diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-24 00:38:48 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-24 00:38:48 +0100 |
| commit | 3111b4ef1e8ac6f1dda92b74b2a46191b498bb1d (patch) | |
| tree | 576bc2e99f430a25d10c74d9d84410f5fbed561d /arch/arm/mach-tegra/board-colibri_t20-pinmux.c | |
| parent | eb880f7c9a3cf7c6ce440c662c84449840e0b64b (diff) | |
colibri_t20: fix menu-key
Due to a strong pull-down on the menu-key multiplexed ACC1_DETECT pin
Android unintentionally entered safe-mode. Fix this by making the
menu-key active-high as well.
Diffstat (limited to 'arch/arm/mach-tegra/board-colibri_t20-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20-pinmux.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c index 5570e8c222e4..85a28213dbe2 100644 --- a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c +++ b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c @@ -288,11 +288,7 @@ static __initdata struct tegra_pingroup_config colibri_t20_pinmux[] = { {TEGRA_PINGROUP_SLXK, TEGRA_MUX_SPI4, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, /* GPIO K6 as KEY_MENU multiplexed ACC1_DETECT */ -#ifdef CONFIG_KEYBOARD_GPIO - {TEGRA_PINGROUP_SPDI, TEGRA_MUX_RSVD, TEGRA_PUPD_PULL_UP, TEGRA_TRI_NORMAL}, -#else {TEGRA_PINGROUP_SPDI, TEGRA_MUX_RSVD, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, -#endif /* GPIO K5 multiplexed USB1_VBUS (USBC_DET) */ {TEGRA_PINGROUP_SPDO, TEGRA_MUX_RSVD, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, |