linux/drivers/input/joystick, branch v3.12.14

Merge branch 'next' into for-linus

2013-09-07T03:23:44Z

Merge first round of changes for 3.12 merge window.

Input: xpad - add signature for Razer Onza Classic Edition

2013-08-26T07:35:01Z

Signed-off-by: Nol "Mag" Archinova Signed-off-by: Dmitry Torokhov

Input: as5011 - fix error return code in as5011_probe()

2013-08-25T00:44:25Z

Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun Signed-off-by: Dmitry Torokhov

Input: joysticks - use dev_get_platdata()

2013-08-13T05:32:30Z

Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly. Signed-off-by: Jingoo Han Signed-off-by: Dmitry Torokhov

Merge branch 'next' into for-linus

2013-07-02T16:01:31Z

Prepare first set of updates for 3.11 merge window.

Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllers

2013-06-19T06:22:04Z

Added MAP_TRIGGERS_TO_BUTTONS for Mad Catz Street Fighter IV FightPad device. This controller model was already supported by the xpad driver, but none of the buttons work correctly without this change. Tested on kernel version 3.9.5. Signed-off-by: Shawn Joseph Signed-off-by: Dmitry Torokhov

input/joystick: use get_cycles on ARM

2013-03-14T21:38:20Z

ARM normally has an accurate clock source, so we can theoretically use analog joysticks more accurately and at the same time avoid the build warning #warning Precise timer not defined for this architecture. from the joystick driver. Now, why anybody would use that driver no ARM I have no idea, but Ben Dooks enabled it in the s3c2410_defconfig along with a bunch of other drivers, even though that platform has neither ISA nor PCI support. It still seems to be the right thing to fix this quirk. Signed-off-by: Arnd Bergmann Cc: Dmitry Torokhov Cc: Vojtech Pavlik Cc: Ben Dooks

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2013-02-20T19:00:43Z

Pull input updates from Dmitry Torokhov: "Two new touchpad drivers - Cypress APA I2C Trackpad and Cypress PS/2 touchpad and a big update to ALPS driver from Kevin Cernekee that adds support for "Rushmore" touchpads and paves way for adding support for "Dolphin" touchpads. There is also a new input driver for Goldfish emulator and also Android keyreset driver was folded into SysRq code. A few more drivers were updated with device tree bindings and others got some small cleanups and fixes." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (55 commits) Input: cyttsp-spi - remove duplicate MODULE_ALIAS() Input: tsc2005 - add MODULE_ALIAS Input: tegra-kbc - require CONFIG_OF, remove platform data Input: synaptics - initialize pointer emulation usage Input: MT - do not apply filtering on emulated events Input: bma150 - make some defines public and fix some comments Input: bma150 - fix checking pm_runtime_get_sync() return value Input: ALPS - enable trackstick on Rushmore touchpads Input: ALPS - add support for "Rushmore" touchpads Input: ALPS - make the V3 packet field decoder "pluggable" Input: ALPS - move pixel and bitmap info into alps_data struct Input: ALPS - fix command mode check Input: ALPS - rework detection of Pinnacle AGx touchpads Input: ALPS - move {addr,nibble}_command settings into alps_set_defaults() Input: ALPS - use function pointers for different protocol handlers Input: ALPS - rework detection sequence Input: ALPS - introduce helper function for repeated commands Input: ALPS - move alps_get_model() down below hw_init code Input: ALPS - copy "model" info into alps_data struct Input: ALPS - document the alps.h data structures ...

Merge branch 'next' into for-linus

2013-02-20T06:05:39Z

Prepare first set of updates for 3.9 merge window.

drivers/input/joystick/analog.c: enable precise timer

2013-02-04T17:53:12Z

Like nm10300, tile can just use get_cycles() for this. Signed-off-by: Chris Metcalf