diff options
author | Varun Wadekar <vwadekar@nvidia.com> | 2011-01-21 10:37:27 +0530 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:11 -0800 |
commit | 13b027c0c6c9c73a1ca868914bf1d75a03ffb713 (patch) | |
tree | 76ea96b8147df172214530eefd0fb2bac7e98b90 /arch/arm | |
parent | eec156abf64b064e8cc58918fda241edc727e8f6 (diff) |
ARM: ventana: gpio-keys: use PQ3 for search and PC7 for menu
remove PC7 from the wake up sources list
bug 781489
Original-Change-Id: I92e2580192c1766fc913185d9f4e04aadf6e0993
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/16494
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R1a55f9e3b6b125d9b203bba83f75fc0bc88e6afb
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-tegra/board-ventana-power.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-power.c b/arch/arm/mach-tegra/board-ventana-power.c index 62121ae0f912..56bb22d4021e 100644 --- a/arch/arm/mach-tegra/board-ventana-power.c +++ b/arch/arm/mach-tegra/board-ventana-power.c @@ -186,10 +186,10 @@ static struct tegra_suspend_platform_data ventana_suspend_data = { .separate_req = true, .corereq_high = false, .sysclkreq_high = true, - .wake_enb = TEGRA_WAKE_GPIO_PV2 | TEGRA_WAKE_GPIO_PC7, + .wake_enb = TEGRA_WAKE_GPIO_PV2, .wake_high = 0, .wake_low = TEGRA_WAKE_GPIO_PV2, - .wake_any = TEGRA_WAKE_GPIO_PC7, + .wake_any = 0, }; int __init ventana_regulator_init(void) diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 0e5e7b40e3e9..4240f2804fb1 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -219,12 +219,13 @@ static void ventana_i2c_init(void) } static struct gpio_keys_button ventana_keys[] = { - [0] = GPIO_KEY(KEY_MENU, PQ3, 0), + [0] = GPIO_KEY(KEY_FIND, PQ3, 0), [1] = GPIO_KEY(KEY_HOME, PQ1, 0), [2] = GPIO_KEY(KEY_BACK, PQ2, 0), [3] = GPIO_KEY(KEY_VOLUMEUP, PQ5, 0), [4] = GPIO_KEY(KEY_VOLUMEDOWN, PQ4, 0), [5] = GPIO_KEY(KEY_POWER, PV2, 1), + [6] = GPIO_KEY(KEY_MENU, PC7, 0), }; static struct gpio_keys_platform_data ventana_keys_platform_data = { |