summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xarch/arm/mach-tegra/board-ventana-power.c4
-rw-r--r--arch/arm/mach-tegra/board-ventana.c3
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 598cfe901edb..0194c1204e18 100755
--- 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 | TEGRA_WAKE_GPIO_PY6,
+ .wake_enb = TEGRA_WAKE_GPIO_PV2 | TEGRA_WAKE_GPIO_PY6,
.wake_high = 0,
.wake_low = TEGRA_WAKE_GPIO_PV2 | TEGRA_WAKE_GPIO_PY6,
- .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 aee591e97580..a225d331cd21 100644
--- a/arch/arm/mach-tegra/board-ventana.c
+++ b/arch/arm/mach-tegra/board-ventana.c
@@ -407,12 +407,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 = {