From 3111b4ef1e8ac6f1dda92b74b2a46191b498bb1d Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Sun, 24 Mar 2013 00:38:48 +0100 Subject: 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. --- arch/arm/mach-tegra/board-colibri_t20-pinmux.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/arm/mach-tegra/board-colibri_t20-pinmux.c') 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}, -- cgit v1.2.3