]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
ARM: tegra11: dalmore: remove SW_LID functionality
authorBharat Nihalani <bnihalani@nvidia.com>
Fri, 11 Jan 2013 11:42:54 +0000 (17:12 +0530)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 19:50:05 +0000 (12:50 -0700)
Due to this, there is an un-desired event generated on Dalmore
after waking up from LP0.

bug 1214079

Change-Id: I0378523df56dea9e186e2ceed53dc601789d93fd
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/190644
(cherry picked from commit b41c67e188e686b391bc96283356a955514074c4)
Reviewed-on: http://git-master/r/190659
(cherry picked from commit ea7921f5ac35ee99efe7f73fbc1e8df3cee39407)
Reviewed-on: http://git-master/r/191614
Reviewed-by: Automatic_Commit_Validation_User
arch/arm/mach-tegra/board-dalmore-kbc.c

index 312017228d610d9c26414237a8ddae58fd7b64c2..dfcfde8dd1266575944a3fd437a3c4c70bc3e77e 100644 (file)
@@ -130,32 +130,9 @@ static struct gpio_keys_button dalmore_int_keys[] = {
                                MAX77663_IRQ_ONOFF_EN0_1SEC, 0, 3000),
 };
 
-static struct gpio_keys_button dalmore_e1611_1000_keys[] = {
-       [0] = {
-               .code = SW_LID,
-               .gpio = TEGRA_GPIO_HALL,
-               .irq = -1,
-               .type = EV_SW,
-               .desc = "Hall Effect Sensor",
-               .active_low = 1,
-               .wakeup = 1,
-               .debounce_interval = 100,
-       },
-};
-
 static struct gpio_keys_button dalmore_e1611_1001_keys[] = {
        [0] = GPIO_KEY(KEY_VOLUMEUP, PR2, 0),
        [1] = GPIO_KEY(KEY_VOLUMEDOWN, PR1, 0),
-       [2] = {
-               .code = SW_LID,
-               .gpio = TEGRA_GPIO_HALL,
-               .irq = -1,
-               .type = EV_SW,
-               .desc = "Hall Effect Sensor",
-               .active_low = 1,
-               .wakeup = 1,
-               .debounce_interval = 100,
-       },
 };
 
 static struct gpio_keys_platform_data dalmore_int_keys_pdata = {
@@ -163,11 +140,6 @@ static struct gpio_keys_platform_data dalmore_int_keys_pdata = {
        .nbuttons       = ARRAY_SIZE(dalmore_int_keys),
 };
 
-static struct gpio_keys_platform_data dalmore_e1611_1000_keys_pdata = {
-       .buttons        = dalmore_e1611_1000_keys,
-       .nbuttons       = ARRAY_SIZE(dalmore_e1611_1000_keys),
-};
-
 static struct gpio_keys_platform_data dalmore_e1611_1001_keys_pdata = {
        .buttons        = dalmore_e1611_1001_keys,
        .nbuttons       = ARRAY_SIZE(dalmore_e1611_1001_keys),
@@ -181,14 +153,6 @@ static struct platform_device dalmore_int_keys_device = {
        },
 };
 
-static struct platform_device dalmore_e1611_1000_keys_device = {
-       .name   = "gpio-keys",
-       .id     = 0,
-       .dev    = {
-               .platform_data  = &dalmore_e1611_1000_keys_pdata,
-       },
-};
-
 static struct platform_device dalmore_e1611_1001_keys_device = {
        .name   = "gpio-keys",
        .id     = 0,
@@ -257,8 +221,6 @@ int __init dalmore_kbc_init(void)
        } else if (board_info.board_id == BOARD_E1611) {
                if (board_info.sku != 1001) {
                        dalmore_register_kbc();
-                       platform_device_register(
-                               &dalmore_e1611_1000_keys_device);
                } else {
                        dalmore_register_kbc();
                        platform_device_register(