aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
AgeCommit message (Collapse)AuthorFilesLines
2012-04-25USB: acecad.c: remove err() usageGreg Kroah-Hartman1-2/+4
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: bcm5974.c: remove err() usageGreg Kroah-Hartman1-6/+6
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Henrik Rydberg <[email protected]> CC: Alessandro Rubini <[email protected]> CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: appletouch.c: remove err() usageGreg Kroah-Hartman1-11/+14
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Alessandro Rubini <[email protected]> CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: yealink.c: remove err() usageGreg Kroah-Hartman1-6/+13
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Henk Vergonet <[email protected]> CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: powermate.c: remove err() usageGreg Kroah-Hartman1-2/+3
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: keyspan_remote.c: remove err() usageGreg Kroah-Hartman1-5/+14
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: cm109.c: remove err() usageGreg Kroah-Hartman1-10/+17
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> CC: Axel Lin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: xpad.c: remove err() usageGreg Kroah-Hartman1-4/+7
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> CC: "Magnus Hörlin" <[email protected]> CC: Rusty Russell <[email protected]> CC: Mauro Carvalho Chehab <[email protected]> CC: Chris Moeller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: iforce: remove err() usageGreg Kroah-Hartman3-6/+12
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. Cc: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-23Input: aiptek - adjust error-handling code labelJulia Lawall1-1/+1
At the point of this error-handling code, aiptek->urb has been allocated, and it does not appear to be less necessary to free it here than in the error-handling code just below. Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-23Input: lpc32xx_ts - fix device tree compatible stringRoland Stigge1-1/+1
During the device tree integration of the various LPC32xx drivers, we agreed on using non-wildcard "compatible" strings. This change switches lpc32xx_ts touchscreen driver to use "nxp,lpc3220-tsc". Signed-off-by: Roland Stigge <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-23Input: atkbd - fix language in a printed messageJesper Juhl1-1/+1
I believe that "trying to access hardware" is more correct English than "trying access hardware". Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-21Input: use module_pci_driverAxel Lin3-39/+5
This patch converts the drivers in drivers/input/* to use module_pci_driver() macro which makes the code smaller and a bit simpler. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-21Merge commit 'v3.4-rc4' into nextDmitry Torokhov33-98/+202
2012-04-20Input: serio_raw - ensure we don't block in non-blocking readDmitry Torokhov1-18/+25
Avoid calling wait_event_interruptible() if client requested non-blocking read, since it is not guaranteed that another thread will not consume event after we checked if serio_raw->head != serio_raw->tail. Also ensure we do not return 0 but keep waiting instead in blocking case, when another thread steals "our" byte. Reviewed-by: David Herrmann <[email protected]> Reviewed-by: Che-Liang Chiou <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-20Input: tc3589x-keypad - remove unnecessary checksDmitry Torokhov1-13/+9
settle_time and debounce_period are u8 and thus can not be greater than TC3589x_MAX_DEBOUNCE_SETTLE which is 255. There also no need to mask out nibbles form board->krow and board->kcol as we validate that they are in correct range. Reported-by: Werner <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-20Input: cma3000-d0x - remove unneeded checksDmitry Torokhov1-1/+1
data->mode is unsigned and can not be less than 0. Reported-by: Werner <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-20Input: matrix-keypad - undo GPIO setup if input_register_device failsDmitry Torokhov1-23/+30
Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-20Input: matrix-keypad - allocate keycodes with keypad structureDmitry Torokhov1-13/+10
Instead of allocating and managing keymap separately from the keypad structure stick it at the end as a variable-length array. Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-20Input: matrix-keypad - fix 'duplicate const' sparse warningDmitry Torokhov1-6/+4
SIMPLE_DEV_PM_OPS already defines constant dev_pm_ops. Also guard PM methods with CONFIG_PM_SLEEP and get rid of some unneeded #ifdefs. Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-20Input: lpc32xx_ts - add device tree supportRoland Stigge1-0/+10
This change implements device tree support for the LPC32xx SoC's touchscreen controller. Signed-off-by: Roland Stigge <[email protected]> Reviewed-by: Thierry Reding <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-20Input: synaptics - fix regression with "image sensor" trackpadsBenjamin Herrenschmidt1-1/+2
commit 7968a5dd492ccc38345013e534ad4c8d6eb60ed1 Input: synaptics - add support for Relative mode Accidentally broke support for advanced gestures (multitouch) on some trackpads such as the one in my ThinkPad X220 by incorretly changing the condition for enabling them. This restores it. Signed-off-by: Benjamin Herrenschmidt <[email protected]> CC: [email protected] [3.3] Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-16mfd: Convert twl6040 to i2c driver, and separate it from twl corePeter Ujfalusi2-4/+3
Complete the separation of the twl6040 from the twl core since it is a separate chip, not part of the twl6030 PMIC. Make the needed Kconfig changes for the depending drivers at the same time to avoid breaking the kernel build (vibra, ASoC components). Signed-off-by: Peter Ujfalusi <[email protected]> Reviewed-by: Mark Brown <[email protected]> Acked-by: Tony Lindgren <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-04-16Input: Kconfig: remove dependency for atmel_tsadcc driverNicolas Ferre1-2/+2
This will allow to select this driver for newer SoCs. Keep dependency on AT91 because of the use of an header file located in include/mach directory. Signed-off-by: Nicolas Ferre <[email protected]> Acked-by: Dmitry Torokhov <[email protected]>
2012-04-12Merge branch 'for-linus' of ↵Linus Torvalds6-13/+28
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input updates from Dmitry Torokhov: "Just a few small fixes..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: da9052 - fix memory leak in da9052_onkey_probe() Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h Input: trackpoint - use psmouse_fmt() for messages Input: elantech - v4 is a clickpad, with only one button Input: elantech - reset touchpad before configuring it Input: sentelic - filter taps in absolute mode Input: tps6507x-ts - fix MODULE_ALIAS to match driver name
2012-04-11Input: da9052 - fix memory leak in da9052_onkey_probe()Jesper Juhl1-1/+2
If, in drivers/input/misc/da9052_onkey.c::da9052_onkey_probe(), the call to either kzalloc() or input_allocate_device() fails then we will return -ENOMEM from the function without freeing the other allocation that may have succeeded, thus we leak either the memory allocated for 'onkey' or the memory allocated for 'input_dev' if one succeeds and the other fails. Fix that by jumping to the 'err_free_mem' label at the end of the function that properly cleans up rather than returning directly. Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-11Input: ep93xx_keypad - switch to using dev_pm_opsDmitry Torokhov1-16/+10
Also use CONFIG_PM_SLEEP instead of CONFIG_PM to guard PM methods. Acked-by: H Hartley Sweeten <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-10Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.hMark Brown1-1/+1
Direct usage of the asm include has long been deprecated by the introduction of gpiolib. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-10Input: wacom_i2c - do not use irq_to_gpioDmitry Torokhov1-37/+4
Because irq_to_gpio() is not available on many platforms let's switch to level-triggered one-shot IRQs that will stay active as long as there is data to be read. Tested-by: Tobita Tatsunosuke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-10Input: trackpoint - use psmouse_fmt() for messagesJJ Ding1-6/+8
Use psmouse_*() macros introduced in commit b5d21704361ee. Signed-off-by: JJ Ding <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-10Input: elantech - v4 is a clickpad, with only one buttonJJ Ding1-2/+4
Add pointer and buttonpad properties for v4 hardware. Also, Jachiet reported that on Asus UX31, right button has no effect. It turns out v4 has only one button, the right-button effect is implemented with software when Windows driver is installed, or in firmware when touchpad is in relative mode. So remove BTN_RIGHT while at it. Reported-by: Jachiet Louis <[email protected]> Signed-off-by: JJ Ding <[email protected]> Reviewed-by: Chase Douglas <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-10Input: elantech - reset touchpad before configuring itJJ Ding1-0/+4
Acer VH40 has a Fn key toggling the touchpad on and off, but it's implemented in system firmware, and the EC chip has to receive reset command to activate this function. Also when this machine wakes up after resume, psmouse_reset is necessary to bring the touchpad back on. Signed-off-by: JJ Ding <[email protected]> Reviewed-by: Chase Douglas <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: gameport - use module_gameport_driverAxel Lin11-136/+11
This patch converts the drivers in drivers/input/* to use module_gameport_driver() macro which makes the code smaller and a bit simpler. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: serio - use module_serio_driverAxel Lin31-452/+31
This patch converts the drivers in drivers/input/* to use module_serio_driver() macro which makes the code smaller and a bit simpler. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: wacom - add Intuos5 multitouch sensor supportJason Gerecke2-5/+84
Intuos5 tablets with PTH-* model numbers include a multitouch sensor which use the same touch reports as the 3rd-generation Bamboo. No useful information is in the HID descriptor for the touch interface so hardcoded values are used during setup. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: wacom - add Intuos5 Touch Ring LED supportJason Gerecke1-12/+59
The Touch Ring LEDs on Intuos5 tablets use a different report format which supports only 4 levels of brightness. We remap the 7-bit value obtained from sysfs to an appropriate value for the tablet. Control of the crop mark LEDs (new to the I5) is left for a later patch. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: wacom - add Intuos5 Touch Ring/ExpressKey supportJason Gerecke2-2/+32
Intuos5 uses a new report type for Touch Ring and ExpressKey data. Note that data from the capacitive sensors present on the ExpressKeys will be ignored until a proper way is found to expose it. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: wacom - add basic Intuos5 supportJason Gerecke2-3/+36
This patch adds support for the basic pen functions of Intuos5 tablets. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Tested-by: Timo Aaltonen <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: st1232 - switch to using SIMPLE_DEV_PM_OPSDmitry Torokhov1-7/+4
Acked-by: Rafael J. Wysocki <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: st1232 - add device tree supportMagnus Damm1-0/+9
This patch enables DT support for the st1232 driver which is primarily used on the sh7372 Mackerel board. [[email protected]: chnaged to use CONFIG_OF and of_match_ptr] Signed-off-by: Magnus Damm <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: add support for LM8333 keypadsWolfram Sang3-0/+247
This driver adds support for the keypad part of the LM8333 and is prepared for possible GPIO/PWM drivers. Note that this is not a MFD because you cannot disable the keypad functionality which, thus, has to be handled by the core anyhow. Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-04Input: add support for Wacom Stylus device with I2C interfaceTatsunosuke Tobita3-0/+328
This adds support for Wacom Stylus device with I2C interface. [Dan Carpenter <[email protected]>: fix NULL-pointer dereference in error handling path.] Signed-off-by: Tatsunosuke Tobita <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-03Input: xilinx_ps2 - allocate serio port separatelyDmitry Torokhov1-17/+18
'struct serio' is a refcounted data structure with lifetime rules different from 'struct xps2data'. It is quite likely that serio_unregister_port() will try to free memory allocated by the port and that is why it should be allocated separately. Also switch to using platform_get/set_drvdata instead of dev_get/set_drvdata because we are dealing with platform device. Reported-by: Tobias Klauser <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-03Input: sentelic - filter taps in absolute modeOskari Saarenmaa1-0/+8
Taps in absolute positioning single-finger mode are currently reported as physical clicks by the driver. This should be handled by userspace, not the kernel. When a tap occurs, the FSP_PB0_LBTN bit is set, but the FSP_PB0_PHY_BTN is not. We use this to filter out physical clicks from taps. Signed-off-by: Oskari Saarenmaa <[email protected]> Reviewed-by: Tai-hwa Liang <[email protected]> Reviewed-by: Chase Douglas <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-03Input: tps6507x-ts - fix MODULE_ALIAS to match driver nameUwe Kleine-König1-3/+1
This is needed to make module auto loading work. [[email protected]: remove file name from comment] Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-29Merge branch 'for-linus' of ↵Linus Torvalds10-194/+694
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull 2nd round of input updates from Dmitry Torokhov: - update to Wacom driver to support wireless devices - update to Sentelci touchpad driver to support newer hardware - update to gpio-keys driver to support "interrupt-only" keys - fixups to earlier commits * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - check for allocation failure in probe() Input: tegra-kbc - allocate pdata before using it Input: amijoy - add missing platform check Input: wacom - wireless battery status Input: wacom - create inputs when wireless connect Input: wacom - wireless monitor framework Input: wacom - isolate input registration Input: sentelic - improve packet debugging information Input: sentelic - minor code cleanup Input: sentelic - enabling absolute coordinates output for newer hardware Input: sentelic - refactor code for upcoming new hardware support Input: gpio_keys - add support for interrupt only keys Input: gpio_keys - consolidate key destructor code Input: revert "gpio_keys - switch to using threaded IRQs" Input: gpio_keys - constify platform data Input: spear-keyboard - remove kbd_set_plat_data()
2012-03-29Input: wacom - check for allocation failure in probe()Dan Carpenter1-0/+2
We accidentally removed the check for NULL in 3aac0ef10b "Input: wacom - isolate input registration". Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-29Merge tag 'fixes-for-linus' of ↵Linus Torvalds1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull arm-soc fixes from Olof Johansson: "This is a first pass of some of the merge window fallout for ARM platforms. Nothing controversial: - A system.h fallout fix for OMAP - PXA fixes for breakage caused by the regulator struct changes - GPIO fixes for OMAP to properly deal with dynamic IRQ allocation - A mismerge in our arm-soc tree of an lpc32xx change for networking - A fix for USB setup on tegra - An undo of __init annotation of display mux setup on OMAP that's needed at runtime" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: pxa: fix build issue on stargate2 ARM: pxa: fix build issue on cm-x300 ARM: pxa: fix build failure for regulator consumer in em-x270.c ARM: LPC32xx: clock.c: Fix lpc-eth clock reference ARM: OMAP: pm: fix compilation break ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit() ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq() ARM: pxa: fix regulator related build fail in magician_defconfig ARM: tegra: Fix device tree AUXDATA for USB/EHCI ARM: OMAP2+: Remove __init from DSI mux functions
2012-03-29Merge branch 'x86-x32-for-linus' of ↵Linus Torvalds2-3/+3
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x32 support for x86-64 from Ingo Molnar: "This tree introduces the X32 binary format and execution mode for x86: 32-bit data space binaries using 64-bit instructions and 64-bit kernel syscalls. This allows applications whose working set fits into a 32 bits address space to make use of 64-bit instructions while using a 32-bit address space with shorter pointers, more compressed data structures, etc." Fix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c} * 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits) x32: Fix alignment fail in struct compat_siginfo x32: Fix stupid ia32/x32 inversion in the siginfo format x32: Add ptrace for x32 x32: Switch to a 64-bit clock_t x32: Provide separate is_ia32_task() and is_x32_task() predicates x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls x86/x32: Fix the binutils auto-detect x32: Warn and disable rather than error if binutils too old x32: Only clear TIF_X32 flag once x32: Make sure TS_COMPAT is cleared for x32 tasks fs: Remove missed ->fds_bits from cessation use of fd_set structs internally fs: Fix close_on_exec pointer in alloc_fdtable x32: Drop non-__vdso weak symbols from the x32 VDSO x32: Fix coding style violations in the x32 VDSO code x32: Add x32 VDSO support x32: Allow x32 to be configured x32: If configured, add x32 system calls to system call tables x32: Handle process creation x32: Signal-related system calls x86: Add #ifdef CONFIG_COMPAT to <asm/sys_ia32.h> ...
2012-03-29Merge branch 'fixes-gpio-to-irq' into fixesTony Lindgren1-1/+1
Conflicts: arch/arm/mach-omap1/board-htcherald.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/plat-omap/include/plat/gpio.h drivers/input/serio/ams_delta_serio.c
Powered by cgit, Gruvboxed by Blaster4385.