diff options
author | Haojian Zhuang <haojian.zhuang@gmail.com> | 2010-09-08 09:44:35 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-28 18:29:46 -0400 |
commit | 2d95ae3bbffe54b2e73e0d291e1d67e09d5e448f (patch) | |
tree | d02d8d7b29575f7e2acac2dab070ffb8942f2111 /drivers/mfd/max8925-core.c | |
parent | f5d59fc575e22f54069628586bf4b31c85bb2f31 (diff) |
input: Monitor both onkey up and down event
Remove original 3-second ONKEY event. Detect ONKEY changing event directly.
So both UP and DOWN event of ONKEY in max8925 are monitered.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/max8925-core.c')
-rw-r--r-- | drivers/mfd/max8925-core.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c index 428377a5a6f5..44695f5a1800 100644 --- a/drivers/mfd/max8925-core.c +++ b/drivers/mfd/max8925-core.c | |||
@@ -93,8 +93,13 @@ static struct mfd_cell rtc_devs[] = { | |||
93 | static struct resource onkey_resources[] = { | 93 | static struct resource onkey_resources[] = { |
94 | { | 94 | { |
95 | .name = "max8925-onkey", | 95 | .name = "max8925-onkey", |
96 | .start = MAX8925_IRQ_GPM_SW_3SEC, | 96 | .start = MAX8925_IRQ_GPM_SW_R, |
97 | .end = MAX8925_IRQ_GPM_SW_3SEC, | 97 | .end = MAX8925_IRQ_GPM_SW_R, |
98 | .flags = IORESOURCE_IRQ, | ||
99 | }, { | ||
100 | .name = "max8925-onkey", | ||
101 | .start = MAX8925_IRQ_GPM_SW_F, | ||
102 | .end = MAX8925_IRQ_GPM_SW_F, | ||
98 | .flags = IORESOURCE_IRQ, | 103 | .flags = IORESOURCE_IRQ, |
99 | }, | 104 | }, |
100 | }; | 105 | }; |
@@ -102,7 +107,7 @@ static struct resource onkey_resources[] = { | |||
102 | static struct mfd_cell onkey_devs[] = { | 107 | static struct mfd_cell onkey_devs[] = { |
103 | { | 108 | { |
104 | .name = "max8925-onkey", | 109 | .name = "max8925-onkey", |
105 | .num_resources = 1, | 110 | .num_resources = 2, |
106 | .resources = &onkey_resources[0], | 111 | .resources = &onkey_resources[0], |
107 | .id = -1, | 112 | .id = -1, |
108 | }, | 113 | }, |