diff options
| author | Linus Torvalds | 2009-04-13 20:37:23 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-04-13 20:37:23 +0200 |
| commit | b534d388c268ad051c72b187106a3c99021be006 (patch) | |
| tree | ccfe40792b52366ce237c2043256d28916a0122e /arch/mips/include/asm/mach-rc32434/gpio.h | |
| parent | PM/Hibernate: Wait for SCSI devices scan to complete during resume (diff) | |
| parent | Merge branch 'next' into for-linus (diff) | |
| download | kernel-qcow2-linux-b534d388c268ad051c72b187106a3c99021be006.tar.gz kernel-qcow2-linux-b534d388c268ad051c72b187106a3c99021be006.tar.xz kernel-qcow2-linux-b534d388c268ad051c72b187106a3c99021be006.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (22 commits)
Input: i8042 - add HP DV9700 to the noloop list
Input: arrange drivers/input/misc/Makefile in alphabetical order
Input: add AD7879 Touchscreen driver
Input: add AD7877 touchscreen driver
Input: bf54x-keys - fix typo in warning
Input: add driver for S1 button of rb532
Input: generic driver for rotary encoders on GPIOs
Input: hilkbd - fix crash when removing hilkbd module
Input: atkbd - add quirk for Fujitsu Siemens Amilo PA 1510
Input: atkbd - consolidate force release quirk setup
Input: add accelerated touchscreen support for Marvell Zylonite
Input: ucb1400_ts, mainstone-wm97xx - add BTN_TOUCH events
Input: wm97xx - use disable_irq_nosync() for Mainstone
Input: wm97xx - add BTN_TOUCH event to wm97xx to use it with Android
Input: fix polling of /proc/bus/input/devices
Input: psmouse - add newline to OLPC HGPK touchpad debugging
Input: ati_remote2 - check module params
Input: ati_remote2 - add per device attrs
Input: ati_remote2 - complete suspend support
Input: stop autorepeat timer on key release
...
Diffstat (limited to 'arch/mips/include/asm/mach-rc32434/gpio.h')
| -rw-r--r-- | arch/mips/include/asm/mach-rc32434/gpio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-rc32434/gpio.h b/arch/mips/include/asm/mach-rc32434/gpio.h index 3cb50d17b62d..12ee8d510160 100644 --- a/arch/mips/include/asm/mach-rc32434/gpio.h +++ b/arch/mips/include/asm/mach-rc32434/gpio.h @@ -80,6 +80,9 @@ struct rb532_gpio_reg { /* Compact Flash GPIO pin */ #define CF_GPIO_NUM 13 +/* S1 button GPIO (shared with UART0_SIN) */ +#define GPIO_BTN_S1 1 + extern void rb532_gpio_set_ilevel(int bit, unsigned gpio); extern void rb532_gpio_set_istat(int bit, unsigned gpio); extern void rb532_gpio_set_func(unsigned gpio); |