diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-02 18:35:17 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-02 18:35:17 -0700 |
| commit | d01d0756f75e7a5b4b43764ad45b83c4340f11d6 (patch) | |
| tree | 90db2ff7ccb35a8fdcf98366e6404afe1f845bc4 /include/linux/input/matrix_keypad.h | |
| parent | b326b853dca2f410b254198ee89abad71a2f4668 (diff) | |
| parent | 0d87c7228a49e8342d60dd552892e470e0b291fa (diff) | |
| download | op-kernel-dev-d01d0756f75e7a5b4b43764ad45b83c4340f11d6.zip op-kernel-dev-d01d0756f75e7a5b4b43764ad45b83c4340f11d6.tar.gz | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/input/matrix_keypad.h')
| -rw-r--r-- | include/linux/input/matrix_keypad.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h index c964cd7..80352ad 100644 --- a/include/linux/input/matrix_keypad.h +++ b/include/linux/input/matrix_keypad.h @@ -41,6 +41,9 @@ struct matrix_keymap_data { * @col_scan_delay_us: delay, measured in microseconds, that is * needed before we can keypad after activating column gpio * @debounce_ms: debounce interval in milliseconds + * @clustered_irq: may be specified if interrupts of all row/column GPIOs + * are bundled to one single irq + * @clustered_irq_flags: flags that are needed for the clustered irq * @active_low: gpio polarity * @wakeup: controls whether the device should be set up as wakeup * source @@ -63,6 +66,9 @@ struct matrix_keypad_platform_data { /* key debounce interval in milli-second */ unsigned int debounce_ms; + unsigned int clustered_irq; + unsigned int clustered_irq_flags; + bool active_low; bool wakeup; bool no_autorepeat; |
