Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3587c258 authored by Mark F. Brown's avatar Mark F. Brown Committed by Eric Miao
Browse files

ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts 



mach-mmp needs to clear wake event in order to clear the keypad interrupt

Signed-off-by: default avatarMark F. Brown <mark.brown314@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 2ce43890

arch/arm/plat-pxa/include/plat/pxa27x_keypad.h

+10 −0
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ 
 *

 * 4. matrix key and direct key will use the same debounce_interval by

 *    default, which should be sufficient in most cases

 *

 * pxa168 keypad platform specific parameter

 *

 * NOTE:

 * clear_wakeup_event callback is a workaround required to clear the

 * keypad interrupt. The keypad wake must be cleared in addition to

 * reading the MI/DI bits in the KPC register.

 */

struct pxa27x_keypad_platform_data {
@@ -52,6 +59,9 @@ struct pxa27x_keypad_platform_data { 


	/* key debounce interval */

	unsigned int	debounce_interval;



	/* clear wakeup event requirement for pxa168 */

	void		(*clear_wakeup_event)(void);

};



extern void pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info);

drivers/input/keyboard/pxa27x_keypad.c

+10 −0
Original line number Diff line number Diff line
@@ -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);