aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
Commit message (Collapse)AuthorAgeFilesLines
* input: add SEC P series dock keyboard driverZiyan2016-04-303-0/+696
| | | | | Based on the sources from: GT-P3110_JB_Opensource, plus: * 0ad65a7 - input: sec_dock_keyboard: only register input device when it's connected
* Input: CEC keyboard driverMuralidhar Dixit2012-05-173-0/+275
| | | | | | | | | Adding support for CEC key board driver in input device. UI commands received from CEC are mapped to the key buttons in the linux kernel. Change-Id: If4136940f28fb4a0c4b9b730aabb8e0fc7837ccf Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
* Input: omap4-keypad: add suspend resume handlersAxel Haslam2011-10-111-0/+27
| | | | | | | | | Add a suspend resume handler that will allow a function pointer to be defined on board files to set or clear a pad wakup bit. Change-Id: I2264bc8d48f02f69c24fed528759c13fdbb12c60 Signed-off-by: Axel Haslam <axelhaslam@ti.com>
* Input: omap4-keypad - cleanup keypad driverAxel Haslam2011-10-041-18/+30
| | | | | | | | | | | | | | | | | | Long key press is not needed on android since it is simulated on user space. Extra interrupts may leave userspace confused. Use bitfiled instead of hardcoded values to set KBD_CTRL, and change PVR divisor to 0x6, which would allow a debouncing time of ~10ms. Set mpu irq to level instead of edge, since if mpu is in low power a edge detection may be lost if the event is a wkup event. Change-Id: I2b96abdfa573614a5a669b13eed8c60baf2b07af Signed-off-by: Andrii Danylov <x0158318@ti.com> Signed-off-by: Axel Haslam <axelhaslam@ti.com>
* Revert "OMAP4: HACK: Clear the Keypad module interrupt status"Axel Haslam2011-10-041-7/+2
| | | | | | This reverts commit 8af9b3e0df0623b3ab6197dfac4b7057fbb31ce1. Change-Id: I2f644974326a9fa428cf2773d37683e3bc039c06
* Revert "OMAP4:HACK Provide Suspend/Resume handler for Keypad driver."Axel Haslam2011-10-041-32/+6
| | | | | | This reverts commit 56716f65ecee225ddc05f0f066bb47a0e5453caa. Change-Id: I95f9abe8ac5e6cd01ca93471379390a65bd3628d
* OMAP4:HACK Provide Suspend/Resume handler for Keypad driver.Rajeev Kulkarni2011-08-221-6/+32
| | | | | | | | | Clear the Interupt status register in Keypad driver suspend and Resume handler.This patch also disables/enables keypad interupts in suspend/resume handlers.This patch also disables keypad module wakeup. Change-Id: Ib44aef79ecb482e9402a6c69c90d4b7396ceac56 Signed-off-by: Rajeev Kulkarni <rajeevk@ti.com>
* OMAP4: HACK: Clear the Keypad module interrupt statusRajeev Kulkarni2011-07-311-2/+7
| | | | | | | | | | | | | | for some reason, if a key is pressed and module wakeup is enabled, CORE and MPU dont enter low power RET. Also, when we resume from suspend there is a pending interrupt that is not cleared, so we are writing 0x0f in KBD_IRQSTATUS to clear any Keypad interrupts. This patch also Enables IO Daisy for KEYPAD. Without this Keypad can not wakeup device from low power state. Change-Id: I4efe3a51d3d7b67fe31440aed7f10c9daa2c1902 Signed-off-by: Rajeev Kulkarni <rajeevk@ti.com>
* input: pmic8xxx-keypad: Do not use mfd_get_data()Samuel Ortiz2011-07-051-1/+2
| | | | | | | mfd_get_data() has been removed from the MFD API. Cc: Anirudh Ghayal <aghayal@codeaurora.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
* Merge branch 'for-linus' of ↵Linus Torvalds2011-06-202-1/+2
|\ | | | | | | | | | | | | | | | | | | 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: Input: sh_keysc - 8x8 MODE_6 fix Input: omap-keypad - add missing input_sync() Input: evdev - try to wake up readers only if we have full packet Input: properly assign return value of clamp() macro.
| * Input: sh_keysc - 8x8 MODE_6 fixMagnus Damm2011-06-181-1/+1
| | | | | | | | | | | | | | | | | | According to the data sheet for G4, AP4 and AG5 KEYSC MODE_6 is 8x8 keys. Bump up MAXKEYS to 64 too. Signed-off-by: Magnus Damm <damm@opensource.se> Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: omap-keypad - add missing input_sync()Janusz Krzysztofik2011-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise the updated evdev driver (commit cdda911c34006f1089f3c87b1a1f, "Input: evdev - only signal polls on full packets") no longer works on top of omap-keypad. Tested on Amstrad Delta. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | input: Add Qualcomm pm8xxx keypad controller driverTrilok Soni2011-05-263-0/+811
| | | | | | | | | | | | | | | | | | | | Add Qualcomm PMIC8XXX based keypad controller driver supporting upto 18x8 matrix configuration. Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Trilok Soni <tsoni@codeaurora.org> Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
* | Merge branch 'for-linus' of ↵Linus Torvalds2011-05-249-59/+1206
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (40 commits) Input: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander Input: tsc2007 - add X, Y and Z fuzz factors to platform data Input: tsc2007 - add poll_period parameter to platform data Input: tsc2007 - add poll_delay parameter to platform data Input: tsc2007 - add max_rt parameter to platform data Input: tsc2007 - debounce pressure measurement Input: ad714x - fix captouch wheel option algorithm Input: ad714x - allow platform code to specify irqflags Input: ad714x - fix threshold and completion interrupt masks Input: ad714x - fix up input configuration Input: elantech - remove support for proprietary X driver Input: elantech - report multitouch with proper ABS_MT messages Input: elantech - export pressure and width when supported Input: elantech - describe further the protocol Input: atmel_tsadcc - correct call to input_free_device Input: add driver FSL MPR121 capacitive touch sensor Input: remove useless synchronize_rcu() calls Input: ads7846 - fix gpio_pendown configuration Input: ads7846 - add possibility to use external vref on ads7846 Input: rotary-encoder - add support for half-period encoders ...
| * Input: ADP5589 - new driver for I2C Keypad Decoder and I/O ExpanderMichael Hennerich2011-05-193-0/+782
| | | | | | | | | | | | | | | | | | | | | | From http://www.analog.com/ADP5589: The ADP5589 is an I/O port expander and keypad matrix decoder designed for QWERTY type phones that require a large keypad matrix and expanded I/O lines. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: add driver FSL MPR121 capacitive touch sensorZhang Jiejing2011-05-123-0/+352
| | | | | | | | | | | | | | | | | | | | | | This patch adds basic support for Freescale MPR121 capacitive touch sensor. It's an i2c controller with up to 12 capacitance sensing inputs. Product information (data sheet, application notes) can be found here: http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=MPR121 Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: tegra-kbc - change wakeup logic to be all or nothingRakesh Iyer2011-05-111-22/+2
| | | | | | | | | | | | | | | | | | Tegra hardware design cannot reliably support an arbitrary set of keys waking up the system. Modify wakeup logic so either any key wakes the system up or none will do. Signed-off-by: Rakesh Iyer <riyer@nvidia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: sh_keysc - only compile PM code if PM is enabledDmitry Torokhov2011-05-051-4/+4
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: sh_keysc - make sh_keysc_device_driver staticDmitry Torokhov2011-05-031-1/+1
| | | | | | | | | | | | | | This variable is not used outside of the module so we should mark it as static. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: sh_keysc - switch to threaded IRQ handlerMagnus Damm2011-04-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update the KEYSC driver to make use of threaded IRQs with IRQF_ONESHOT to improve interrupt latency. The driver is using udelay() in the ISR to make sure the hardware has stabilized. Without using interrupt threads this delay may affect the latency of the rest of the system. Also pass dev_name() as string for /proc/interrupts. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: sh_keysc - implement runtime PM supportMagnus Damm2011-04-281-25/+15
| | | | | | | | | | | | | | | | | | | | | | Convert the KEYSC driver from MSTP bit control through a magic clock string to making use of Runtime PM. Also, update the system suspend/resume callbacks to drop the Runtime PM reference in the case of wakeup disabled. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: tegra-kbc - add ghost key filterRakesh Iyer2011-04-271-0/+36
| | | | | | | | | | | | | | | | Add ghost key filtering support for the Nvidia Tegra matrix keyboard. Signed-off-by: Rakesh Iyer <riyer@nvidia.com> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: omap-keypad - fix a wrong free_irq() parameterAxel Lin2011-04-271-3/+3
| | | | | | | | | | | | | | | | In current implementation, free_irq() was using NULL rather than the driver data as the data pointer so free_irq() wouldn't have matched. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: qt1070 - add MODULE_DEVICE_TABLEAxel Lin2011-04-271-0/+1
| | | | | | | | | | | | | | | | Adding the necessary MODULE_DEVICE_TABLE() information allows the driver to be automatically loaded by udev Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Merge commit 'v2.6.39-rc4' into nextDmitry Torokhov2011-04-225-9/+67
| |\
| * | Input: gpio-keys - add support for setting device nameAlexander Stein2011-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch allows to set a device name which helps distinguishing several gpio-keys devices. Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: gpio_keys - add support for EV_ABSAlexander Stein2011-04-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | With this patch you can setup a group of GPIOs representing a specific position on an EV_ABS axis. Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | input/atari: Fix atarimouse initMichael Schmitz2011-05-191-2/+3
| |/ |/| | | | | | | | | | | | | | | | | Atarimouse fails to load as a module (with ENODEV), due to a brown paper bag bug, misinterpreting the semantics of atari_keyb_init(). [geert] Propagate the return value of atari_keyb_init() everywhere Signed-off-by: Michael Schmitz <schmitz@debian.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* | Merge branch 'for-linus' of ↵Linus Torvalds2011-04-181-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Input: xen-kbdfront - fix mouse getting stuck after save/restore Input: estimate number of events per packet Input: evdev - indicate buffer overrun with SYN_DROPPED Input: document event types and codes and their intended use Input: add KEY_IMAGES specifically for AL Image Browser Input: twl4030_keypad - fix potential NULL dereference in twl4030_kp_probe() Input: h3600_ts - fix error handling at connect Input: twl4030_keypad - avoid potential NULL-pointer dereference
| * | Input: twl4030_keypad - fix potential NULL dereference in twl4030_kp_probe()Axel Lin2011-04-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | We should first check whether platform data is NULL or not, before dereferencing it to get the keymap. Signed-off-by: Axel Lin <axel.lin@gmail.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: twl4030_keypad - avoid potential NULL-pointer dereferenceShubhrajyoti D2011-04-061-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Shubhrajyoti D <a0393217@india.ti.com> Acked-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6Linus Torvalds2011-04-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
| * | | Fix common misspellingsLucas De Marchi2011-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
* | | | Merge branch 'for-linus' of ↵Linus Torvalds2011-04-051-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Input: rpckbd - fix a leak of the IRQ during init failure Input: wacom - add support for Lenovo tablet ID (0xE6) Input: i8042 - downgrade selftest error message to dbg() Input: synaptics - fix crash in synaptics_module_init() Input: spear-keyboard - fix inverted condition in interrupt handler Input: uinput - allow for 0/0 min/max on absolute axes. Input: sparse-keymap - report KEY_UNKNOWN for unknown scan codes Input: sparse-keymap - report scancodes with key events Input: h3600_ts_input - fix a spelling error Input: wacom - report resolution for pen devices Input: wacom - constify wacom_features for a new missed Bamboo models
| * | Input: spear-keyboard - fix inverted condition in interrupt handlerRajeev Kumar2011-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We should return IRQ_NONE from interrupt handler in case keyboard does not report DATA_AVAIL condition. Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | drivers: Final irq namespace conversionThomas Gleixner2011-03-291-2/+2
|/ / | | | | | | | | | | Scripted with coccinelle. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* | Merge branch 'next' into for-linusDmitry Torokhov2011-03-1810-58/+948
|\ \ | |/
| * Input: tc3589x-keypad - fix 'double const' warningDmitry Torokhov2011-03-151-11/+11
| | | | | | | | | | | | Also rearrange driver structure initializer a bit. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: tca6416-keypad - suspend/resume wakeup supportMagnus Damm2011-03-151-0/+28
| | | | | | | | | | | | | | | | | | | | | | Extend the tca6416 driver to use enable_irq_wake() and disable_irq_wake() in the suspend/resume hooks. This makes it possible to wake up from suspend-to-ram using a tca6416 key on the sh7372 mackerel board. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: add Atmel AT42QT1070 keypad driverBo Shen2011-03-133-0/+287
| | | | | | | | | | | | | | | | | | | | The AT42QT1070 QTouch sensor supports up to 7 keys. The driver has been tested on Atmel AT91SAM9M10-G45-EK board, and it should work fine on other platforms. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: mcs_touchkey - add shutdown handlerHeungJun Kim2011-02-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | The MCS50XX series has a HW bug that requires explicit chip power down. If chip is not powered down before shutting the system down the control pins (powerup, interrupt) are pulled up and residue current continues flowing into the chips making them continue consuming power. Signed-off-by: Heungjun Kim <riverful.kim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: mcs_touchkey - add support for suspend/resumeHeungjun Kim2011-02-231-1/+47
| | | | | | | | | | | | | | | | This adds support for system-level suspend/resume to the driver. Signed-off-by: Heungjun Kim <riverful.kim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: omap4-keypad - wire up runtime PM handlingAbraham Arce2011-02-231-19/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Runtime PM functionality in OMAP4 driver based on the following assumptions: - keyboard controller in wakeup domain so it is always on and power impact is minimal; - in OMAP4 the device control is at module/device level and ick/fclk level control is difficult so cutting of clocks will prevent interrupts. Signed-off-by: Abraham Arce <x0066660@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: max7359 - convert to dev_pm_opsMark Brown2011-02-211-7/+10
| | | | | | | | | | | | | | | | There is a general move to convert drivers to use dev_pm_ops rather than bus specific ops to facilitate core work. Do this conversion for max7359. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: lm8323 - convert to dev_pm_opsMark Brown2011-02-211-7/+8
| | | | | | | | | | | | | | | | | | There is a general move away from bus specific PM operations to using dev_pm_ops in order to facilicate core improvements. Update lm8323 to the new model. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Merge branch 'for-linus' of ↵Linus Torvalds2011-01-311-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Input: synaptics - retry failed resets when reconnecting Input: synaptics - fix reconnect logic on MT devices Input: tegra-kbc - fix keymap entry for LeftMeta key Input: tegra-kbc - fix build error
| * \ Merge branch 'for-linus' of ↵Linus Torvalds2011-01-265-5/+744
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Input: wacom - pass touch resolution to clients through input_absinfo Input: wacom - add 2 Bamboo Pen and touch models Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent Input: sparse-keymap - fix KEY_VSW handling in sparse_keymap_setup Input: tegra-kbc - add tegra keyboard driver Input: gpio_keys - switch to using request_any_context_irq Input: serio - allow registered drivers to get status flag Input: ct82710c - return proper error code for ct82c710_open Input: bu21013_ts - added regulator support Input: bu21013_ts - remove duplicate resolution parameters Input: tnetv107x-ts - don't treat NULL clk as an error Input: tnetv107x-keypad - don't treat NULL clk as an error Fix up trivial conflicts in drivers/input/keyboard/Makefile due to additions of tc3589x/Tegra drivers
| * | | kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The meaning of CONFIG_EMBEDDED has long since been obsoleted; the option is used to configure any non-standard kernel with a much larger scope than only small devices. This patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes references to the option throughout the kernel. A new CONFIG_EMBEDDED option is added that automatically selects CONFIG_EXPERT when enabled and can be used in the future to isolate options that should only be considered for embedded systems (RISC architectures, SLOB, etc). Calling the option "EXPERT" more accurately represents its intention: only expert users who understand the impact of the configuration changes they are making should enable it. Reviewed-by: Ingo Molnar <mingo@elte.hu> Acked-by: David Woodhouse <david.woodhouse@intel.com> Signed-off-by: David Rientjes <rientjes@google.com> Cc: Greg KH <gregkh@suse.de> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jens Axboe <axboe@kernel.dk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Robin Holt <holt@sgi.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | | Merge branch 'for-linus' of ↵Linus Torvalds2011-01-133-199/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Input: add SW_ROTATE_LOCK switch type Input: fix force feedback capability query example Input: wacom_w8001 - add single-touch support Input: add Austria Microsystem AS5011 joystick driver Input: remove aaed2000 keyboard driver Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13 Input: cy8ctmg110_ts - Convert to dev_pm_ops Input: migor_ts - convert to dev_pm_ops Input: mcs5000_ts - convert to dev_pm_ops Input: eeti_ts - convert to dev_pm_ops Input: ad7879 - convert I2C to dev_pm_ops
| * \ \ \ Merge branch 'for-linus' of ↵Linus Torvalds2011-01-074-7/+370
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (58 commits) Input: wacom_w8001 - support pen or touch only devices Input: wacom_w8001 - use __set_bit to set keybits Input: bu21013_ts - fix misuse of logical operation in place of bitop Input: i8042 - add Acer Aspire 5100 to the Dritek list Input: wacom - add support for digitizer in Lenovo W700 Input: psmouse - disable the synaptics extension on OLPC machines Input: psmouse - fix up Synaptics comment Input: synaptics - ignore bogus mt packet Input: synaptics - add multi-finger and semi-mt support Input: synaptics - report clickpad property input: mt: Document interface updates Input: fix double equality sign in uevent Input: introduce device properties hid: egalax: Add support for Wetab (726b) Input: include MT library as source for kerneldoc MAINTAINERS: Update input-mt entry hid: egalax: Add support for Samsung NB30 netbook hid: egalax: Document the new devices in Kconfig hid: egalax: Add support for Wetab hid: egalax: Convert to MT slots ... Fixed up trivial conflict in drivers/input/keyboard/Kconfig