arm: tegra: cardhu: Enabling Power key for display wakeup
Laxman Dewangan [Fri, 11 Feb 2011 14:57:07 +0000 (19:57 +0530)]
Enabling POWER/ONKEY to generate POWER event in E1198 and E1291.

Bug 786302

Original-Change-Id: Ie24eacf6c7346389503633b67d51d3f0a4ed08e5
Reviewed-on: http://git-master/r/19255
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Original-Change-Id: I56dd388033d9da5809f1015f4ec6b2ca2902778b

Rebase-Id: Rbe7395e0958033e268366ac93862bb70f65936dd

arch/arm/mach-tegra/board-cardhu-kbc.c
arch/arm/mach-tegra/board-cardhu-pinmux.c

index 5b542ce..6cb78e4 100644 (file)
@@ -241,6 +241,7 @@ static struct gpio_keys_button cardhu_keys_e1291[] = {
        [3] = GPIO_KEY(KEY_SEARCH, PQ3, 0),
        [4] = GPIO_KEY(KEY_VOLUMEUP, PQ0, 0),
        [5] = GPIO_KEY(KEY_VOLUMEDOWN, PQ1, 0),
+       [6] = GPIO_KEY(KEY_POWER, PV0, 1),
 };
 
 static struct gpio_keys_platform_data cardhu_keys_e1291_platform_data = {
@@ -259,7 +260,6 @@ static struct platform_device cardhu_keys_e1291_device = {
 int __init cardhu_keys_init(void)
 {
        int i;
-       int ret;
        struct board_info board_info;
 
        tegra_get_board_info(&board_info);
index 437ceba..ffe3bcb 100644 (file)
@@ -324,7 +324,7 @@ static __initdata struct tegra_pingroup_config cardhu_pinmux[] = {
        DEFAULT_PINMUX(KB_COL3,         KBC,             PULL_UP,   NORMAL,     INPUT),
        DEFAULT_PINMUX(KB_COL4,         KBC,             PULL_UP,   NORMAL,     INPUT),
        DEFAULT_PINMUX(KB_COL5,         KBC,             PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PV0,        RSVD,            NORMAL,    NORMAL,     OUTPUT),
+       DEFAULT_PINMUX(GPIO_PV0,        RSVD,            PULL_UP,   NORMAL,     INPUT),
 
        DEFAULT_PINMUX(CLK_32K_OUT,     BLINK,           NORMAL,    NORMAL,     OUTPUT),
        DEFAULT_PINMUX(SYS_CLK_REQ,     SYSCLK,          NORMAL,    NORMAL,     OUTPUT),