From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.brown314@gmail.com (Mark F. Brown) Date: Thu, 26 Aug 2010 11:27:35 -0400 Subject: [PATCH v2 4/6] ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts In-Reply-To: <1282836457-5651-1-git-send-email-mark.brown314@gmail.com> References: <1282836457-5651-1-git-send-email-mark.brown314@gmail.com> Message-ID: <1282836457-5651-5-git-send-email-mark.brown314@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org mach-mmp needs to clear wake event in order to clear the keypad interrupt Signed-off-by: Mark F. Brown --- arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | 1 + drivers/input/keyboard/pxa27x_keypad.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h index 7b4eadc..73dacda 100644 --- a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +++ b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h @@ -52,6 +52,7 @@ struct pxa27x_keypad_platform_data { /* key debounce interval */ unsigned int debounce_interval; + void (*clear_wakeup_event)(void); }; extern void pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info); diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 0610d10..b36d2be 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c @@ -330,11 +330,21 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad) keypad->direct_key_state = new_state; } +static void clear_wakeup_event(struct pxa27x_keypad *keypad) +{ + struct pxa27x_keypad_platform_data *pdata = keypad->pdata; + + if (pdata->clear_wakeup_event) + (pdata->clear_wakeup_event)(); +} + static irqreturn_t pxa27x_keypad_irq_handler(int irq, void *dev_id) { struct pxa27x_keypad *keypad = dev_id; unsigned long kpc = keypad_readl(KPC); + clear_wakeup_event(keypad); + if (kpc & KPC_DI) pxa27x_keypad_scan_direct(keypad); -- 1.7.0.4