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 | |
| 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')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20-pinmux.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20.c | 6 |
2 files changed, 4 insertions, 6 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}, diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c index 74699eed0996..9b2271299aad 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.c +++ b/arch/arm/mach-tegra/board-colibri_t20.c @@ -536,7 +536,9 @@ static void colibri_t20_i2c_init(void) Note: active-low means pull-ups required on carrier board resp. via pin-muxing Note2: power-key active-high due to EvalBoard v3.1a having 100 K pull-down - on SODIMM pin 45 */ + on SODIMM pin 45 + Note3: menu-key active-high due to strong pull-down on multiplexed + ACC1_DETECT */ #ifdef CONFIG_KEYBOARD_GPIO #define GPIO_KEY(_id, _gpio, _lowactive, _iswake) \ @@ -559,7 +561,7 @@ static struct gpio_keys_button colibri_t20_keys[] = { [4] = GPIO_KEY(KEY_VOLUMEDOWN, PBB5, 1, 0), /* SODIMM pin 24 */ [5] = GPIO_KEY(KEY_POWER, PV3, 0, 1), /* SODIMM pin 45, Iris X16-20 */ - [6] = GPIO_KEY(KEY_MENU, PK6, 1, 0), /* SODIMM pin 135 */ + [6] = GPIO_KEY(KEY_MENU, PK6, 0, 0), /* SODIMM pin 135 */ }; #define PMC_WAKE_STATUS 0x14 |