diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2010-02-25 13:32:24 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-09 00:30:53 -0500 |
commit | ae4a8c1903e5d0ec19dcb257ec922b888941abba (patch) | |
tree | feb7915f56d54b2517132f894b65e948c93039d3 /arch/blackfin | |
parent | ef8873e06efdc023ee2e7f708787c79b78df3fcd (diff) | |
download | linux-3.10-ae4a8c1903e5d0ec19dcb257ec922b888941abba.tar.gz linux-3.10-ae4a8c1903e5d0ec19dcb257ec922b888941abba.tar.bz2 linux-3.10-ae4a8c1903e5d0ec19dcb257ec922b888941abba.zip |
Blackfin: don't support keypad wakeup from hibernate
The on-chip keypad peripheral requires different registers to be setup
depending on the standby type (standby vs hibernation). However, since
the power management framework doesn't differentiate between these types,
the driver doesn't know which registers to program and subsequently it
avoids doing so.
Always enabling the keyboard wakeup source causes misbehavior when the
pins are not assigned to the keypad. If they happen to drive a certain
level, they'll trigger a wake up event which is not wanted. So until
the aforementioned issue can be sorted out, drop support for the
wakeup source completely.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 11c05f3e178..7ad8878bfa1 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c @@ -252,11 +252,6 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state) wakeup |= USBWE; break; #endif -#ifdef IRQ_KEY - case IRQ_KEY: - wakeup |= KPADWE; - break; -#endif #ifdef CONFIG_BF54x case IRQ_CNT: wakeup |= ROTWE; |