aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'for-linus' of ↵Linus Torvalds2009-12-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (51 commits) Input: appletouch - give up maintainership Input: dm355evm_kbd - switch to using sparse keymap library Input: wistron_btns - switch to using sparse keymap library Input: add generic support for sparse keymaps Input: fix memory leak in force feedback core Input: wistron - remove identification strings from DMI table Input: psmouse - remove identification strings from DMI tables Input: atkbd - remove identification strings from DMI table Input: i8042 - remove identification strings from DMI tables DMI: allow omitting ident strings in DMI tables Input: psmouse - do not carry DMI data around Input: matrix-keypad - switch to using dev_pm_ops Input: keyboard - fix lack of locking when traversing handler->h_list Input: gpio_keys - scan gpio state at probe and resume time Input: keyboard - add locking around event handling Input: usbtouchscreen - add support for ET&T TC5UH touchscreen controller Input: xpad - add two new Xbox 360 devices Input: polled device - do not start polling if interval is zero Input: polled device - schedule first poll immediately Input: add S3C24XX touchscreen driver ...
| * Input: appletouch - give up maintainershipJohannes Berg2009-12-07
| | | | | | | | | | | | | | | | | | I no longer have a machine with this, and as such am not really able to help out with this driver any more. Remove the entire appletouch section and let the driver fall under the general input subsystem. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: dm355evm_kbd - switch to using sparse keymap libraryDmitry Torokhov2009-12-07
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: wistron_btns - switch to using sparse keymap libraryDmitry Torokhov2009-12-07
| | | | | | | | | | | | | | The keymap manipulation code was split into a library module, so let's make us of it. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: add generic support for sparse keymapsDmitry Torokhov2009-12-07
| | | | | | | | | | | | | | | | | | More and more devices choose to reimplement support for sparse keymaps first introduced by wistron driver. Move it into a library module so it can be easily used by interested parties. Reviewed-by: Anisse Astier <anisse@astier.eu> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: fix memory leak in force feedback coreJari Vanhala2009-12-05
| | | | | | | | | | | | | | Effects were allocated, but not freed anywhere. Signed-off-by: Jari Vanhala <ext-jari.vanhala@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: wistron - remove identification strings from DMI tableDmitry Torokhov2009-12-05
| | | | | | | | | | | | | | | | The driver does not reference identification strings in DMI table and since these strings are no longer required by DMI core we can safely remove them and save some memory. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: psmouse - remove identification strings from DMI tablesDmitry Torokhov2009-12-05
| | | | | | | | | | | | | | | | The driver does not reference identification strings in DMI tables and since these strings are no longer required by DMI core we can safely remove them and save some memory. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: atkbd - remove identification strings from DMI tableDmitry Torokhov2009-12-05
| | | | | | | | | | | | | | | | The driver does not reference identification strings in DMI table and since these strings are no longer required by DMI core we can safely remove them and save some memory. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: i8042 - remove identification strings from DMI tablesDmitry Torokhov2009-12-05
| | | | | | | | | | | | | | | | The driver does not reference identification strings in DMI tables and since these strings are no longer required by DMI core we can safely remove them and save some memory. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * DMI: allow omitting ident strings in DMI tablesDmitry Torokhov2009-12-05
| | | | | | | | | | | | | | | | | | | | | | | | The purpose of dmi->ident is twofold - it may be used by DMI callback functions when composing log messages; it is also used to determine end of DMI table in dmi_check_system() and dmi_first_match(). However, in case when callbacks are not interested in using ident at all it just wastes memory. Let's make entries with empty first match slot serve as end-of-table markers instead. Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: psmouse - do not carry DMI data aroundDmitry Torokhov2009-12-04
| | | | | | | | | | | | | | DMI tables use considerable amount of memory. Mark them as __initconst so they will be discarded once module is loaded. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: matrix-keypad - switch to using dev_pm_opsDmitry Torokhov2009-12-04
| | | | | | | | | | Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Merge commit 'v2.6.32' into nextDmitry Torokhov2009-12-03
| |\
| * | Input: keyboard - fix lack of locking when traversing handler->h_listDmitry Torokhov2009-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyboard handler should not attempt to traverse handler->h_list on its own, without any locking, otherwise it races with registering and unregistering of input handles which leads to crashes. Introduce input_handler_for_each_handle() helper that allows safely iterate over all handles attached to a particular handler and switch keyboard handler to use it. Reported-by: Jim Paradis <jparadis@redhat.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: gpio_keys - scan gpio state at probe and resume timeDaniel Mack2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to read and report gpio state when we bind the driver to the device and upon resume so that userspace has correct state of the switches (and keys but they are less important since, even if they are happened to be pressed, we'd expect them to be released fairly soon). Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: keyboard - add locking around event handlingDmitry Torokhov2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyboard input handler is multiplexing events form all keyboard-like devices in the system. Because of that per-device lock provided by input core is not enough to prevent clashes in ked_event() and we need our own lock to ensure that only one thread at a time executing kbd_event(). Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: usbtouchscreen - add support for ET&T TC5UH touchscreen controllerPetr Štetiar2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the ET&T TC5UH 5-wire USB touchscreen controller. More info at http://www.etandt.com.tw/board_solution.html Signed-off-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: xpad - add two new Xbox 360 devicesNicolas Léveillé2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added two new Xbox 360 devices: - HORI Real Arcade Pro.EX - Mad Catz SFIV Fightpad Signed-off-by: Nicolas Léveillé <nicolas@uucidl.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: polled device - do not start polling if interval is zeroSamu Onkalo2009-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the poll interval is set to 0 via new sysfs entry and device is opened after that, polling is started with interval 0. This causes huge CPU load. Same happens if the rate was 0 when the device was closed and then reopened. Signed-off-by: Samu Onkalo <samu.p.onkalo@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: polled device - schedule first poll immediatelyDmitry Torokhov2009-11-23
| | | | | | | | | | | | | | | | | | | | | It does not make sense to wait poll_interval before performing first read after opening the device, schedule the read immediately instead. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: add S3C24XX touchscreen driverArnaud Patard2009-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S3C24XX touchscreen driver, originally written by Arnaud Patard and other contributors. The driver has had substantial testing as well as a number of tidying up passes done by Ben Dooks, as noted: - added kernel-doc comments to most of the routines - removed old code from pre adc framework days - updated device probe code to use platform id list matching - cleaned up debug, since printk() now has timestamp feature - ensure code uses dev_() reporting macros where necessary - remove ABS_PRESSURE reporting, tslib can be fixed - ensure timer is removed on driver exit - move to using dev_pmops for power management Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: usbtouchscreen - add support for Zytronic capacitive touchscreenDaniel Silverstone2009-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zytronic USB-attached capacitive touchscreen support within the generic USB touchscreen driver. Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk> Signed-off-by: Vincent Sanders <vince@simtec.co.uk> Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: force feedback - fix function name in commentRoger Quadros2009-11-23
| | | | | | | | | | | | | | | | | | | | | Function name is input_ff_destroy() and not input_ff_free() Signed-off-by: Roger Quadros <roger.quadros@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: do not overwrite the first part of phys stringMárton Németh2009-11-23
| | | | | | | | | | | | | | | | | | | | | | | | Use strlcat() to append a string to the previously created first part. Signed-off-by: Márton Németh <nm127@freemail.hu> Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: ads7846 - switch to using dev_vdbg()Pavel Machek2009-11-23
| | | | | | | | | | | | | | | Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: ads7846 - fix pressure reportingPavel Machek2009-11-23
| | | | | | | | | | | | | | | | | | | | | | | | On Zaurus, hx4700 and others pressure is reported inverted -- the lighter the pressure, the bigger numerical value. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: usbtouchscreen - remove unneeded usb_kill_urbOliver Neukum2009-11-23
| | | | | | | | | | | | | | | | | | | | | | | | usb_kill_urb() in disconnect is not needed as unregistering will cause close() to be called. Signed-off-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | AT91: add touchscreen support for at91sam9g45ekesNicolas Ferre2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New at91sam9g45ekes board provides a LCD with resistive touchscreen. This is the support of this feature by atmel_tsadcc driver. This also sets up platform parameters to be passed to the driver. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | AT91: add platform parameters for atmel_tsadcc in at91sam9rlekNicolas Ferre2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setup platform parameters in at91sam9rl-ek board to be passed to atmel_tsadcc touchscreen. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: atmel_tsadcc - use platform parametersNicolas Ferre2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a number of plafrom dependent parameters to atmel_tsadcc. The touchscreeen driver can now take into account the slight differences that exist between IPs included in diferent products. This will also allow to adapt its behaivior to the caracteristics of the resistive panel used. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: atmel_tsadcc - rework setting touchscreen capabilitiesNicolas Ferre2009-11-20
| | | | | | | | | | | | | | | | | | | | | Tiny patch for setting capabilities using input API function. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: keyboard - fix theoretical race on vt switchAlan Jenkins2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A VT switch can theoretically change fg_console between vc = vc_cons[fg_console].d and kbd = kbd_table + fg_console Fix it by replacing the second fg_console with vc->vc_num. Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: ALPS - add support for touchpads with 4-directional buttonMaxim Levitsky2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The touchpad on Acer Aspire 5720, 5520 and some other Aspire models (signature 0x73, 0x02, 0x50) has a button that can be rocked in 4 different directions. Make the driver to generate BTN_0..BTN_3 events in response. The Synaptics driver by default maps BTN_0 and BTN_1 to up and down, so there should be no visible changes with the old setup that generated BTN_FORWARD and BTN_BACK (also mapped to up and down). Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: psmouse - rework setting of BTN_MIDDLE capabilityDmitry Torokhov2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not start protocol detection assuming that middle mouse is present, instead let individual protocols explicitly set this capability. This fixes issue with Synaptics touchpads pretending that they have middle button when hardware clearly reports otherwise. Reported-and-tested-by: Andrey Borzenkov <arvidjaar@mail.ru> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: lifebook - do not advertise unsupported buttonsDmitry Torokhov2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | The main input device of Lifebook touchscreens does not generate left/right/middle button events and therefore should not be advertising them in its capabilities. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: elantech - do not advertise relative eventsDmitry Torokhov2009-11-20
| | | | | | | | | | | | | | | | | | | | | Elantech touchpads work in absolute mode and do not generate relative events so they should not be advertising them. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: touchkit_ps2 - do not advertise unsupported buttonsDmitry Torokhov2009-11-20
| | | | | | | | | | | | | | | | | | | | | Touchkit PS/2 touchscreen does not have left/right/middle buttons and should not be advertising as capable of generating these events. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: input-polldev, matrix-keypad - include in kernel docDmitry Torokhov2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | Make sure that polled input device and matrix keypad APIs are included with the rest of input API when generating kernel documentation. Also description of absres was missing as well. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: input-polldev - add sysfs interface for controlling poll intervalSamu Onkalo2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sysfs entry for reading and setting of the polling interval. If the interval is set to 0, polling is stopped. Polling is restarted when interval is changed to non-zero. sysfs entries: poll = current polling interval in msec (RW) max = max allowed polling interval (RO) min = min allowed polling interval (RO) Minimum and maximum limit for interval can be set while setting up the device. Interval can be adjusted even if the input device is not currently open. [dtor@mail.ru: add kernel doc markup for the new fields] Signed-off-by: Samu Onkalo <samu.p.onkalo@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: gpio_keys - seperate individual button setup to make code neaterBen Dooks2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the code that deals with setting up each individual button out into a new function to reduce the indentation and allow us to common up some of the error recovery code. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: gpio_keys - use <linux/gpio.h> instead of <asm/gpio.h>Ben Dooks2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | The gpio keys driver should be using <linux/gpio.h> instead of <asm/gpio.h> Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: gpio_keys - use dev_ macros to report informationBen Dooks2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gpio_keys driver is binding to a platform device but using pr_err() to report errors. Change to using dev_err() so that all messages are prefixed by the device name. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: ucb1400_ts - allow passing IRQ through platfrom_dataMarek Vasut2009-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows UCB1400 to get IRQ GPIO from platform data. In case platform_data are not supplied or the IRQ supplied in the platform_data is negative, fall back to the old IRQ detection algorithm. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: add new keycodes useful in mobile devicesJani Nikula2009-11-06
| | | | | | | | | | | | | | | | | | | | | | | | Add new codes for camera focus key, and camera lens cover, keypad slide, front proximity switches. Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Merge commit 'v2.6.32-rc6' into nextDmitry Torokhov2009-11-06
| |\ \
| * | | Input: synaptic_i2c - make unnecessarily global functions staticDmitry Torokhov2009-11-03
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: mark custom_data in ff_periodic_effect as __userDmitry Torokhov2009-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom_data pointer in ff_periodict_effect structure is a userspace pointer and should be marked as such. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: add driver for Dynapro serial touchscreenTias Guns2009-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a driver for Dynapro serial touchscreen, which used to be supported in Xorg. The driver needs updated inputattach utility to initialize serial port and create proper serio device before the driver will be bound to it. Signed-off-by: Tias Guns <tias@ulyssis.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: add open and close methods for polled devicesSamu Onkalo2009-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optional open and close methods for preparing and closing the device. Signed-off-by: Samu Onkalo <samu.p.onkalo@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>