aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
AgeCommit message (Collapse)AuthorFilesLines
2008-04-04Merge branch 'xbox'Dmitry Torokhov1-24/+187
2008-04-03Input: xpad - don't use GFP_ATOMICOliver Neukum1-2/+2
GFP_ATOMIC should not be used when GFP_KERNEL can be used. Signed-off-by: Oliver Neukum <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-03Input: xpad - add support for wireless xbox360 controllersBrian Magnuson1-16/+148
Signed-off-by: Brian Magnuson <[email protected]> Signed-off-by: Anssi Hannula <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-03Input: xpad - drop obsolete driver versioningAnssi Hannula1-3/+4
The driver version numbers and changelog have not been updated in a long while to reflect actual changes. Remove the version number and add a notice that later changes can be tracked in SCM. Signed-off-by: Anssi Hannula <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-03Input: xpad - enable force feedback on xbox 360 controllers onlyAnssi Hannula1-0/+3
Commit 4994cd8dadcf9d484ab3ec19f3c7c7a4e5353c1c introduced a regression which causes xpad to report force feedback cababilities for non-360 controllers too, even while there is no actual support for those. Fix that by adding a check for XTYPE_XBOX360 to xpad_init_ff(). Signed-off-by: Anssi Hannula <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-03Input: xpad - do not report nonexistent buttons for xbox360Anssi Hannula1-4/+14
The buttons BTN_C and BTN_Z are only used in the original xbox controller, not in xbox360 controller. Therefore only add them to keybit when the controller is a non-360 one. Signed-off-by: Anssi Hannula <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-03Input: xpad - add more xbox 360 controller idsAnssi Hannula1-0/+6
Add Mad Catz and 0x0e6f xbox360 controllers which are already found in xpad_device[] table in xpad.c into the vendor id list. Also add Logitech into the vendor list for Logitech Chillstream gamepads. Also add the RedOctane Guitar Hero X-plorer. Signed-off-by: Anssi Hannula <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-03Input: xpad - fix inverted Y and RY axesAnssi Hannula1-4/+4
The commit ae91d10aab2762f81733e9194cb56eff99c8d808 inverted Y and RY axes on xbox360 so that up is positive and down is negative. This is wrong, as axes on game controllers have up as negative per convention. Also, even xpad itself reports HAT0X with up as negative. Fix that by inverting them again. Also, according to http://bugzilla.kernel.org/show_bug.cgi?id=10337 the original xbox controllers also have the Y and RY axes inverted. Fix that by inverting them as well. Cc: Brian Magnuson <[email protected]> Signed-off-by: Anssi Hannula <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-03Input: xpad - fix dpad handling of unknown devicesAnssi Hannula1-2/+2
For devices not specifically listed in xpad.c, xpad->dpad_mapping is initially set to MAP_DPAD_UNKNOWN. In xpad_probe() it gets changed to either MAP_DPAD_TO_BUTTONS or MAP_DPAD_TO_AXES, depending on the module parameter dpad_to_buttons. However, MAP_DPAD_UNKNOWN is defined as -1, while the field is u8. This results in actual value of 255, causing the MAP_DPAD_UNKNOWN check in xpad_probe() to fail. Fix that by defining MAP_DPAD_UNKNOWN as 2 instead. Also, setting module parameter dpad_to_buttons to 1 should obviously map dpad to buttons, while the default behaviour (0) should be to map dpad to axes. However, dpad_to_buttons is directly assigned to xpad->dpad_mapping, and as MAP_DPAD_TO_BUTTONS is 0, the actual behaviour is reversed. Fix that by negating dpad_to_buttons in assignment. Signed-off-by: Anssi Hannula <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-03Input: xpad - match xbox 360 devices with interface infoAnssi Hannula1-5/+16
Match Xbox 360 controllers using the interface info, i.e. interface class 255 (Vendor specific), subclass 93 and protocol 1, instead of specifying the device ids individually. As the class is vendor-specific, we have to still match against vendor id as well, though. Signed-off-by: Anssi Hannula <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: tosakbd - fix suspendDmitry Baryshkov1-3/+18
Signed-off-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: appletouch - add product IDs for the 4th generation MacBooksTobias Mueller1-1/+12
Signed-off-by: Tobias Mueller <[email protected]> Acked-by: Johannes Berg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Merge branch 'wm97xx'Dmitry Torokhov7-0/+2426
2008-04-02Input: appletouch - add product IDs for the 4th generation MacBooksTobias Mueller1-1/+12
Signed-off-by: Tobias Mueller <[email protected]> Acked-by: Johannes Berg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: WM97xx - add support for streaming mode on MainstoneMark Brown3-0/+315
Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Graeme Gregory <[email protected]> Signed-off-by: Mike Arthur <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: WM97xx - add chip driver for WM97123 touchscreenMark Brown3-0/+470
Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Graeme Gregory <[email protected]> Signed-off-by: Mike Arthur <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Lars Munch <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: WM97xx - add chip driver for WM9712 touchscreenMark Brown3-0/+472
Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Graeme Gregory <[email protected]> Signed-off-by: Mike Arthur <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Lars Munch <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: WM97xx - add chip driver for WM9705 touchscreenMark Brown3-0/+363
Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Graeme Gregory <[email protected]> Signed-off-by: Mike Arthur <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: add support for WM97xx familty touchscreensMark Brown3-0/+806
Add support for the touchscreen controllers provided by Wolfson Microelectronics WM97xx series chips in both polled and streaming modes. These drivers have been maintained out of tree since 2003. During that time the driver the primary maintainer was Liam Girdwood and a number of people have made contributions including Dmitry Baryshkov, Stanley Cai, Rodolfo Giometti, Russell King, Marc Kleine-Budde, Ian Molton, Vincent Sanders, Andrew Zabolotny, Graeme Gregory, Mike Arthur and myself. Apologies to anyone I have omitted. Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Graeme Gregory <[email protected]> Signed-off-by: Mike Arthur <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: ads7846 - simplify support of external vREF (and ads7843)David Brownell1-12/+10
This updates the ads7846 driver to handle external vREF (required on boards using ads7843 chips) without module parameters, and also removes a needless variable with its associated bogus gcc warning. Signed-off-by: David Brownell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: locomokbd - add 'off' button support for Sharp Collie/PoodleHelge Deller1-25/+48
Enables the Sharp Zaurus Collie and Poodle devices to be turned off by pressing the "Cancel" button for a few seconds (as designed by Sharp). Additional small cleanups: - removal of unused #defines and variables - add missing __devinit/__devexit/__devinitconst annotations - reorganized copyright notice Signed-off-by: Helge Deller <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-02Input: remove private member from input_dev structureDmitry Torokhov1-3/+3
Everyone should be using input_{get|set}_drvdata() by now. Alias them to dev_{get|set}_drvdata() and remove ->private. Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-01Input: make sure input interfaces pin parent input devicesDmitry Torokhov3-6/+6
Recent driver core change causes references to parent devices being dropped early, at device_del() time, as opposed to when all children are freed. This causes oops in evdev with grabbed devices. Take the reference to the parent input device ourselves to ensure that it stays around long enough. Signed-off-by: Dmitry Torokhov <[email protected]>
2008-04-01Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into ↵Dmitry Torokhov2-0/+4
for-linus
2008-03-30evdev: Release eventual input device grabs when getting disconnectedBjörn Steinbrink1-0/+3
When getting disconnected we need to release eventual grabs on the underlying input device as we also release the input device itself. Otherwise, we would try to release the grab when the client that requested it closes its handle, accessing the input device which might already be freed. Signed-off-by: Björn Steinbrink <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-03-28ixp4xx-beeper: add MODULE_ALIASAlessandro Zummo1-0/+1
The following patch allows ixp4xx-beeper to be loaded by udev automatically when compiled as a module with kernel versions 2.4.24 and greater. This patch is required because 43cc71eed1250755986da4c0f9898f9a635cb3bf ("platform: prefix MODALIAS with "platform:"") changed the modalias string to have the extra prefix. LKG7102D7:~# udevinfo -a -p /sys/devices/platform/ixp4xx-beeper.4 looking at device '/devices/platform/ixp4xx-beeper.4': KERNEL=="ixp4xx-beeper.4" SUBSYSTEM=="platform" DRIVER=="" ATTR{modalias}=="platform:ixp4xx-beeper" udev therefore tries to modprobe platform:ixp4xx-beeper instead of ixp4xx-beeper. LKG7102D7:~# udevtest /sys/devices/platform/ixp4xx-beeper.4 ... import_uevent_var: import into environment: 'PHYSDEVBUS=platform' import_uevent_var: import into environment: 'MODALIAS=platform:ixp4xx-beeper' main: looking at device '/devices/platform/ixp4xx-beeper.4' from subsystem 'platform' wait_for_sysfs: file '/sys/devices/platform/ixp4xx-beeper.4/bus' appeared after 0 loops main: run: 'socket:/org/kernel/udev/monitor' main: run: '/sbin/modprobe --use-blacklist platform:ixp4xx-beeper' With this patch, depmod adds an alias line (see below) to modules.alias which allows modprobe to load the right module. alias platform:ixp4xx-beeper ixp4xx-beeper Signed-off-by: Gordon Farquharson <[email protected]> Signed-off-by: Alessandro Zummo <[email protected]> Cc: Kay Sievers <[email protected]> Cc: David Brownell <[email protected]> Cc: Atsushi Nemoto <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Dmitry Torokhov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-03-24Input: apm-power - fix crash when unloading modulesHelge Deller1-5/+2
Fix a crash in the apm-power driver when an input-device, such as keyboard driver module, is unloaded. Signed-off-by: Helge Deller <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-20Input: pxa27x - fix keypad KPC macrosSamuel Ortiz1-3/+3
We want to mask (key_number - 1), not key_number. The current implementation works fine for all values but the maximum one, i.e. 8. Signed-off-by: Samuel Ortiz <[email protected]> Acked-by: Eric Miao <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-18Input: ALPS - fix forward/back buttons reversed on Acer 5520-5290Laszlo Kajan1-2/+2
ALPS_FW_BK_1 protocol flavor seems to have forward and backward keys reversed. Signed-off-by: Laszlo Kajan <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-18Input: ALPS - put secondary device in proper place in sysfsDmitry Torokhov1-0/+1
Secondary input device did not have parent set up causing it to appear in the root of sysfs device hierarchy. Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-14Input: wacom - add support for Bamboo1, BambooFun, and Cintiq 12WXPing Cheng4-12/+32
Add support for new wacom tablets - Bamboo1, BambooFun, and Cintiq 12WX Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-14Input: ads7846 - fix uninitialized var warningAndrew Morton1-1/+1
drivers/input/touchscreen/ads7846.c: In function 'ads7846_read12_ser': drivers/input/touchscreen/ads7846.c:216: warning: 'sample' may be used uninitialized in this function Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-14Input: i8042 - add SNI RM supportThomas Bogendoerfer2-0/+77
SNI RM200 don't have the i8042 controller connected to the EISA bus, but have a second address range for onboard devices. This patch handles the two possible address ranges for the i8042 on SNI RMs. Signed-off-by: Thomas Bogendoerfer <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-14Input: i8042 - add Lenovo 3000 N100 to nomux blacklistJiri Kosina1-0/+7
Lenovo 3000 N100 needs entry in nomux blacklist. Reported-by: Christopher Desjardins <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-14Input: i8042 - fix warning on non-x86 buildsRoland Dreier1-2/+1
Commit c18bab80 ("Input: i8042 - non-x86 build fix") introduced the following warning on non-x86 builds: drivers/input/serio/i8042.c: In function 'i8042_probe': drivers/input/serio/i8042.c:1154: warning: unused variable 'param' Fix this by moving the parameter variable declaration into the #ifdef too. Signed-off-by: Roland Dreier <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-14Input: cobalt_btns - assorted fixesYoichi Yuasa1-8/+8
- fix compile errors (keymap is in bdev, not pdev) - cdev is no more (must use dev.parent) - update copiright notice Signed-off-by: Yoichi Yuasa <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-03-10i8042: use SGI_HAS_I8042 to select SGI i8042 handlinigThomas Bogendoerfer1-1/+1
Use SGI_HAS_I8042 to select SGI i8042 handling Signed-off-by: Thomas Bogendoerfer <[email protected]> Cc: Dmitry Torokhov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-03-04input: add I2C to config since the driver makes several i2c*() callsRandy Dunlap1-3/+3
Add to help text that the Intel I2C ICH (i801) driver is also needed for this kernel. Add LEDS_CLASS to config since the driver makes les_classdev_*() calls: ERROR: "led_classdev_register" [drivers/input/misc/apanel.ko] undefined! ERROR: "__led_classdev_unregister" [drivers/input/misc/apanel.ko] undefined! Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-02-08mn10300: add the MN10300/AM33 architecture to the kernelDavid Howells1-2/+4
Add architecture support for the MN10300/AM33 CPUs produced by MEI to the kernel. This patch also adds board support for the ASB2303 with the ASB2308 daughter board, and the ASB2305. The only processor supported is the MN103E010, which is an AM33v2 core plus on-chip devices. [[email protected]: nuke cvs control strings] Signed-off-by: Masakazu Urade <[email protected]> Signed-off-by: Koichi Yasutake <[email protected]> Signed-off-by: David Howells <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-02-07Merge branch 'for-linus' of ↵Linus Torvalds38-459/+1938
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: (34 commits) Input: i8042 - non-x86 build fix Input: pxa27x_keypad - also enable on PXA3xx Input: pxa27x_keypad - add debounce_interval to the keypad platform data Input: pxa27x_keypad - use device resources for I/O memory mapping and IRQ Input: pxa27x_keypad - enable rotary encoders and direct keys Input: pxa27x_keypad - introduce pxa27x_keypad_config() Input: pxa27x_keypad - introduce driver structure and use KEY() to define matrix keys Input: pxa27x_keypad - remove pin configuration from the driver Input: pxa27x_keypad - rename the driver (was pxa27x_keyboard) Input: constify function pointer tables (seq_operations) Input: i8042 - add Fujitsu-Siemens Amilo Pro 2010 to nomux list Input: i8042 - enable DMI quirks on x86-64 Input: i8042 - add Dritek quirk for Acer Aspire 9110 Input: add input event to APM event bridge Input: mousedev - use BIT_MASK instead of BIT Input: remove duplicate includes Input: remove cdev from input_dev structure Input: remove duplicated headers in drivers/char/keyboard.c Input: i8042 - add Dritek keyboard extension quirk Input: add Tosa keyboard driver ...
2008-02-07leds: Standardise LED naming schemeRichard Purdie1-2/+2
As discussed on LKML some notion of 'function' is needed in LED naming. This patch adds this to the documentation and standardises existing LED drivers. Signed-off-by: Richard Purdie <[email protected]>
2008-02-06Remove pointless casts from void pointersJeff Garzik1-2/+2
Mostly in and around irq handlers. Signed-off-by: Jeff Garzik <[email protected]> Cc: Russell King <[email protected]> Cc: "Luck Tony" <[email protected]> Cc: Roman Zippel <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Cc: Karsten Keil <[email protected]> Acked-by: "John W. Linville" <[email protected]> Cc: James Bottomley <[email protected]> Cc: David Brownell <[email protected]> Cc: "Antonino A. Daplas" <[email protected]> Acked-by: Josh Boyer <[email protected]> Acked-by: Holger Schurig <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-02-06Merge branch 'pxa-keypad'Dmitry Torokhov4-279/+577
2008-02-06Input: i8042 - non-x86 build fixAndrew Morton1-2/+2
Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-02-03drivers/input/: Spelling fixesJoe Perches1-1/+1
Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Adrian Bunk <[email protected]>
2008-02-03jonada720: remove duplicate includeAndre Haupt1-1/+0
Signed-off-by: Andre Haupt <[email protected]> Acked-by: Kristoffer Ericson <[email protected]> Signed-off-by: Adrian Bunk <[email protected]>
2008-02-03bf54x: remove duplicate includeAndre Haupt1-1/+0
Signed-off-by: Andre Haupt <[email protected]> Signed-off-by: Adrian Bunk <[email protected]>
2008-02-03gameport: remove duplicate includeAndre Haupt1-1/+0
Signed-off-by: Andre Haupt <[email protected]> Signed-off-by: Adrian Bunk <[email protected]>
2008-01-31[ALSA] Remove sound/driver.hTakashi Iwai1-1/+0
This header file exists only for some hacks to adapt alsa-driver tree. It's useless for building in the kernel. Let's move a few lines in it to sound/core.h and remove it. With this patch, sound/driver.h isn't removed but has just a single compile warning to include it. This should be really killed in future. Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]>
2008-01-31Input: pxa27x_keypad - also enable on PXA3xxEric Miao1-3/+3
Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.