aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
AgeCommit message (Collapse)AuthorFilesLines
2012-03-09Merge commit 'v3.3-rc6' into nextDmitry Torokhov48-301/+367
2012-03-08Merge branch 'next/cleanup-s3c24xx' of ↵Olof Johansson1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup * 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (24 commits) ARM: S3C24XX: remove call to s3c24xx_setup_clocks ARM: S3C24XX: add get_rate for clk_p on S3C2416/2443 ARM: S3C24XX: add get_rate for clk_h on S3C2416/2443 ARM: S3C24XX: remove XXX_setup_clocks method from S3C2443 ARM: S3C24XX: remove obsolete S3C2416_DMA option ARM: S3C24XX: Reuse S3C2443 dma for S3C2416 ARM: S3C24XX: Fix indentation of dma-s3c2443 ARM: S3C24XX: Move device setup files to mach directory ARM: S3C24XX: Consolidate Simtec extensions ARM: S3C24XX: move simtec-specific code to mach directory ARM: S3C24XX: Move common-smdk code to mach directory ARM: S3C24XX: Move s3c2443-clock.c to mach-s3c24xx ARM: s3c2410_defconfig: update s3c2410_defconfig ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/ ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/ ARM: S3C2416: move mach-s3c2416/* into mach-s3c24xx/ ARM: S3C2412: move mach-s3c2412/* into mach-s3c24xx/ ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/ ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX ARM: S3C2410: move s3c2410_baseclk_add to clock.h ...
2012-03-07Merge branch 'for-linus' of ↵Linus Torvalds5-8/+11
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input updates from Dmitry Torokhov: "Just a few driver fixups, nothing exciting." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - fix 3rd-gen Bamboo MT when 4+ fingers are in use Input: twl4030-vibra - use proper guard for PM methods Input: evdev - fix variable initialisation Input: wacom - add missing LEDS_CLASS to Kconfig Input: ALPS - fix touchpad detection when buttons are pressed
2012-03-07Input: wacom - fix 3rd-gen Bamboo MT when 4+ fingers are in useJason Gerecke1-1/+1
The message count field uses three bits of storage, not two. Signed-off-by: Jason Gerecke <[email protected]> Acked-by: Chris Bagwell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-06Input: max8925_onkey - avoid accessing input device too earlyDmitry Torokhov1-47/+44
Input device must be allocated (but not necessarily registered) before requesting IRQs, otherwise there is a chance that IRQ handler fires and tries to reference not yet allocated input device. Also it makes sense to store relative IRQ numbers in max8925_onkey_info structure as they are needed in suspend/resume which we expect to be called more often than probe and remove. Acked-by: Haojian Zhuang <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-06mfd: Add ability to wake the system for 88pm860xJett.Zhou1-0/+26
For 88pm860x pmic, it can wake the system from low power mode by irq, its sub-devs like RTC and onkey can be enabled for this usage. Signed-off-by: Jett.Zhou <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-03-06mfd: Add pdata to set mc13783-ts conversion delayMichael Thalmeier1-1/+10
MC13783 can be programmed to wait some clock cycles between the touchscreen polarization and the resistance conversion. This is needed to adjust for touchscreens with high capacitance between plates. Signed-off-by: Michael Thalmeier <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-03-05Input: max8925_onkey - allow to be used as a wakeup sourceKevin Liu1-0/+34
Implement suspend and resume methods to set up devices as wakeup source. Signed-off-by: Kevin Liu <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-04Input: atmel-wm97xx - convert to dev_pm_opsDmitry Torokhov1-8/+9
Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-04Input: atmel-wm97xx - set driver ownerDmitry Torokhov1-1/+2
This allows creating proper sysfs link between driver and its module. Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-04Input: cyttsp - remove useless checks in cyttsp_probe()Dmitry Torokhov1-1/+1
This fixes reference-before-check problem; there is no reason to check if caller passed NULL dev or bus_ops as it is done only by bus-specific drivers which already do the right thing. Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-04Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037Armando Visconti2-0/+72
The Data Modul TP 72037 EasyTouch controller is derived from EGALAX controller and is capable of detecting dual contacts. Packets can be 5 bytes or 10 bytes long, depending whether one or two contacts are detected. Format is same as EGALAX touch controller, but with x and y coordinates inverted. Signed-off-by: Armando Visconti <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Daniel Ritz <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-04Input: add support for OnKey module for DA9052/53 PMICAshish Jangam3-0/+180
On-key Driver for Dialog Semiconductor DA9052/53 PMICs. Signed-off-by: David Dajun Chen <[email protected]> Signed-off-by: Ashish Jangam <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-04Input: add support for TI Touchscreen controllerRachna Patil3-0/+499
This patch adds support for TI's touchscreen controller for a 4/5/8 wire resistive panel that is directly fed to the ADC. This touchscreen controller will be part of AM335x TI SoC. The TRM can be found at: http://www.ti.com/lit/ug/spruh73a/spruh73a.pdf Signed-off-by: Patil, Rachna <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-03ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XXKukjin Kim1-1/+1
This patch changes the ARCH name to "ARCH_S3C24XX" for Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, and S3C2450 SoCs so that we can merge the mach-xxx directories and plat-s3c24xx dir. to just one mach-s3c24xx for them. I think this should be sent to upstream via samsung tree because this touches many samsung stuff. Cc: Dmitry Torokhov <[email protected]> Cc: Richard Purdie <[email protected]> Cc: Chris Ball <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> [for the gadget part:] Acked-by: Felipe Balbi <[email protected]> [for the framebuffer (video) part:] Acked-by: Florian Tobias Schandinat <[email protected]> [For the watchdog-part:] Acked-by: Wim Van Sebroeck <[email protected]> Cc: Sangbeom Kim <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: Mark Brown <[email protected]> Cc: Russell King <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-03-01ARM: OMAP1: ams-delta: clean up init data section assignmentsJanusz Krzysztofik1-1/+1
The main purpose of this patch is to fix several section mismatch warnings from the board file and a few board specific drivers, introduced with recent Amstrad Delta patch series, some of them rising up only when building with CONFIG_MODULES not set. While being at it, section tagging of all init data found in the board file have been revised and hopefully corrected and/or optimized. Signed-off-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2012-03-01Merge branch 'omap1' into ams-deltaTony Lindgren1-20/+34
2012-02-28Input: spear-keyboard - provide thaw and poweroff routinesViresh Kumar1-7/+2
Thaw and poweroff routines are missing for spear-keyboard. They are required for: - Error case scenarios during freeze - Using test features, of hibernate. Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Rajeev Kumar <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-28Input: spear-keyboard - configure device according to supplied modeRajeev Kumar1-1/+6
Let platform pass mode information to keyboard driver according to which it configures itself. The mode can be - KEYPAD_9x9 0 - KEYPAD_6x6 1 - KEYPAD_2x2 2 Signed-off-by: Rajeev Kumar <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-24Input: psmouse - use psmouse_[de]activate() from sentelic and hgpk driversPaul Fox2-15/+6
Make use of psmouse_activate() and psmouse_deactivate() from psmouse-base.c Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-24Input: psmouse - allow drivers to use psmouse_{de,}activateAndres Salomon2-5/+12
Other drivers duplicate this code; no sense in having it be private to psmouse-base. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-24Input: twl4030-vibra - use proper guard for PM methodsDmitry Torokhov1-4/+2
On m68k: drivers/input/misc/twl4030-vibra.c:175:5: warning: "CONFIG_PM" is not defined We should use #ifdef instead of #if and also check CONFIG_PM_SLEEP instead of CONFIG_PM. Reported-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-24Input: evdev - fix variable initialisationHeiko Stübner1-1/+1
Commit 509f87c5f564 (evdev - do not block waiting for an event if fd is nonblock) created a code path were it was possible to use retval uninitialized. This could lead to the xorg evdev input driver getting corrupt data and refusing to work with log messages like AUO-Pixcir touchscreen: Read error: Success sg060_keys: Read error: Success AUO-Pixcir touchscreen: Read error: Success sg060_keys: Read error: Success (for drivers auo-pixcir-ts and gpio-keys). Signed-off-by: Heiko Stuebner <[email protected]> Acked-by: Dima Zavin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-24Input: wacom - add missing LEDS_CLASS to KconfigChris Bagwell1-0/+2
Signed-off-by: Chris Bagwell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-24Input: ALPS - fix touchpad detection when buttons are pressedAkio Idehara1-2/+5
ALPS touchpad detection fails if some buttons of ALPS are pressed. The reason is that the "E6" query response byte is different from what is expected. This was tested on a Toshiba Portege R500. Cc: stable <[email protected]> Signed-off-by: Akio Idehara <[email protected]> Tested-by: Seth Forshee <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-20compat: Use COMPAT_USE_64BIT_TIME in the input subsystemH. J. Lu2-3/+3
Enable the input system to be used with a compat ABI with 64-bit time. Signed-off-by: H. Peter Anvin <[email protected]> Cc: Dmitry Torokhov <[email protected]>
2012-02-14bcm5974: Add pointer and buttonpad propertiesChase Douglas1-0/+1
To simplify detection as a touchpad, inform userspace of the physical properties of the device. Signed-off-by: Chase Douglas <[email protected]> [[email protected]: conflict resolution] Signed-off-by: Henrik Rydberg <[email protected]>
2012-02-09ARM: sa1111: add platform enable/disable functionsRussell King1-1/+5
Add platform hooks to be called when individual sa1111 devices are enabled and disabled. This will allow us to move some platform specifics out of the individual drivers. Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-02-09ARM: sa1111: add .owner initializer to sa1111 driver structuresRussell King1-0/+1
Add a .owner initializer to the sa1111 driver structures to allow allow the modules to be associated with their driver structures. Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-02-09Input: Add EVIOC mechanism for MT slotsHenrik Rydberg1-1/+26
This patch adds the ability to extract MT slot data via a new ioctl, EVIOCGMTSLOTS. The function returns an array of slot values for the specified ABS_MT event type. Example of user space usage: struct { unsigned code; int values[64]; } req; req.code = ABS_MT_POSITION_X; if (ioctl(fd, EVIOCGMTSLOTS(sizeof(req)), &req) < 0) return -1; for (i = 0; i < 64; i++) printf("slot %d: %d\n", i, req.values[i]); Reviewed-by: Chase Douglas <[email protected]> Signed-off-by: Henrik Rydberg <[email protected]>
2012-02-04Merge branch 'for-linus' of ↵Linus Torvalds4-10/+18
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: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist Input: serio_raw - return proper result when serio_raw_read fails Input: document device properties Input: twl4030_keypad - fix comment (trivial) Input: gpio_keys - fix struct device declared inside parameter list Input: evdev - fix variable initialisation
2012-02-03Input: tegra-kbc - allow skipping setting up some of GPIO pinsShridhar Rasal1-7/+27
Allow marking some of GPIO pins as ignored to to avoid continuously generating KBC input events. Signed-off-by: Shridhar Rasal <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-03Input: add Synaptics USB device driverJan Steinhoff3-0/+586
This patch adds a driver for Synaptics USB touchpad or pointing stick devices. These USB devices emulate an USB mouse by default, so one can also use the usbhid driver. However, in combination with special user space drivers this kernel driver allows one to customize the behaviour of the device. An extended version of this driver with support for the cPad background display can be found at <http://jan-steinhoff.de/linux/synaptics-usb.html>. Signed-off-by: Jan Steinhoff <[email protected]> Acked-by: Jiri Kosina <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-03Input: add infrastructure for selecting clockid for event time stampsJohn Stultz1-4/+21
As noted by Arve and others, since wall time can jump backwards, it is difficult to use for input because one cannot determine if one event occurred before another or for how long a key was pressed. However, the timestamp field is part of the kernel ABI, and cannot be changed without possibly breaking existing users. This patch adds a new IOCTL that allows a clockid to be set in the evdev_client struct that will specify which time base to use for event timestamps (ie: CLOCK_MONOTONIC instead of CLOCK_REALTIME). For now we only support CLOCK_MONOTONIC and CLOCK_REALTIME, but in the future we could support other clockids if appropriate. The default remains CLOCK_REALTIME, so we don't change the ABI. Signed-off-by: John Stultz <[email protected]> Reviewed-by: Daniel Kurtz <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-03Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklistIgor Murzov1-0/+7
From 2d5a38a56453421e82428155f4b00303f3fb19b2 Mon Sep 17 00:00:00 2001 From: Igor Murzov <[email protected]> Date: Wed, 1 Feb 2012 03:11:53 +0400 Subject: [PATCH] Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist Lenovo Ideapad U455 needs to be in the reset quirk list for its touchpad's proper function. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=40672 Signed-off-by: Igor Murzov <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-02Input: Use accessor for MT valuesHenrik Rydberg1-1/+1
The current MT accessor function does not distinguish between the MT values and the slot specification event. Add an accessor function for the values only, and use it where appropriate. Signed-off-by: Henrik Rydberg <[email protected]>
2012-02-01Input: serio_raw - return proper result when serio_raw_read failsChe-Liang Chiou1-6/+9
serio_raw_read now returns (sometimes partially) successful number of bytes transferred to the caller, and only returns error code to the caller on completely failed transfers. Signed-off-by: Che-Liang Chiou <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-01Input: twl4030_keypad - fix comment (trivial)Felipe Contreras1-3/+1
And trivial whitespace fixes. Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-02-01Input: evdev - fix variable initialisationHeiko Stübner1-1/+1
Commit 509f87c5f564 (evdev - do not block waiting for an event if fd is nonblock) created a code path were it was possible to use retval uninitialized. This could lead to the xorg evdev input driver getting corrupt data and refusing to work with log messages like AUO-Pixcir touchscreen: Read error: Success sg060_keys: Read error: Success AUO-Pixcir touchscreen: Read error: Success sg060_keys: Read error: Success (for drivers auo-pixcir-ts and gpio-keys). Signed-off-by: Heiko Stuebner <[email protected]> Acked-by: Dima Zavin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-31Input: add Cypress TTSP capacitive multi-touch screen supportJavier Martinez Canillas6-2/+1165
Cypress TrueTouch(tm) Standard Product controllers are found in a wide range of embedded devices. This driver add support for a variety of TTSP controllers. Since the hardware is capable of tracking identifiable contacts, multi-touch protocol type B (stateful) is used to report contact information. The driver is composed of a core driver that process the data sent by the contacts and a set of bus specific interface modules. This patch adds the base core TTSP driver. Signed-off-by: Javier Martinez Canillas <[email protected]> Reviewed-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-31Input: wacom - use switch statement for wacom_tpc_irq()Ping Cheng2-6/+20
And add two new data formats. Tested-by: Chris Bagwell <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-31Input: wacom - use BTN_TOOL_FINGER to indicate touch device typePing Cheng2-7/+3
Tested-by: Chris Bagwell <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-31Input: pcf8574_keypad - fix typo in KconfigMasanari Iida1-1/+1
Correct spelling "connetced" to "connected" in pcf8574_keypad description in drivers/input/misc/Kconfig. Signed-off-by: Masanari Iida <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-24Driver core: driver_find() drops reference before returningAlan Stern2-2/+0
As part of the removal of get_driver()/put_driver(), this patch (as1510) changes driver_find(); it now drops the reference it acquires before returning. The patch also adjusts all the callers of driver_find() to remove the now unnecessary calls to put_driver(). In addition, the patch adds a warning to driver_find(): Callers must make sure the driver they are searching for does not get unloaded while they are using it. This has always been the case; driver_find() has never prevented a driver from being unregistered or unloaded. Hence the patch will not introduce any new bugs. The existing callers all seem to be okay in this respect, however I don't understand the video drivers well enough to be certain about them. Signed-off-by: Alan Stern <[email protected]> CC: Dmitry Torokhov <[email protected]> CC: Kyungmin Park <[email protected]> CC: Andy Walls <[email protected]> CC: Martin Schwidefsky <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-01-23Input: tegra-kbc - enable key interrupt for wakeupRakesh Iyer1-0/+17
Enable keypress interrupt to support wakeup from low power state. Signed-off-by: Rakesh Iyer <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-23Input: samsung-keypad - don't synchronise with runtime PM putMark Brown1-3/+3
We don't actually care if the device has been runtime suspended immediately so we can just drop the reference without waiting for any state change to be implemented. This may allow us to avoid some suspend/resume cycles and is a bit more friendly to the rest of the system. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-23Input: q40kbd - convert driver to the split modelDmitry Torokhov1-60/+79
Convert the driver to standard spilt model arch-specific code registers platform device to which driver code can bind later. Also request IRQ immediately upon binding to the device instead of doing this when serio port is being opened. Acked-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-23Input: at32psif - convert to dev_pm_opsDmitry Torokhov1-11/+11
Convert driver to use dev_pm_ops instead of legacy PM infrastructure. Also make 'open' a bool since it is really a boolean. Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-23Input: nomadik-ske-keypad - convert to using SIMPLE_DEV_PM_OPSDmitry Torokhov1-8/+4
Also proper guard for system suspend/resume methods is CONFIG_PM_SLEEP, not CONFIG_PM. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-01-23Input: nomadik-ske-keypad - do not assign driver's probe() methodDmitry Torokhov1-3/+2
Because we are using platform_device_probe() to register the driver we do not need to assign driver's probe method. We also can mark ske_keypad_probe(), together with ske_keypad_chip_init(), as __init instead of __devinit. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>