From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Mark F. Brown" Subject: [PATCH v2 4/6 RESEND] ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts Date: Fri, 3 Sep 2010 18:28:09 -0400 Message-ID: <1283552891-13966-5-git-send-email-mark.brown314@gmail.com> References: <1283552891-13966-1-git-send-email-mark.brown314@gmail.com> Return-path: Received: from mail-qy0-f174.google.com ([209.85.216.174]:58245 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753746Ab0ICW3t (ORCPT ); Fri, 3 Sep 2010 18:29:49 -0400 In-Reply-To: <1283552891-13966-1-git-send-email-mark.brown314@gmail.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Eric Miao , Haojian Zhuang , linux-arm-kernel li Cc: "Mark F. Brown" 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