linux/drivers/input, branch v3.1

Merge branch 'for-linus' of git://github.com/dtor/input

2011-10-05T16:22:38Z

* 'for-linus' of git://github.com/dtor/input: Input: wacom - revert "Cintiq 21UX2 does not have menu strips"

Input: wacom - revert "Cintiq 21UX2 does not have menu strips"

2011-10-05T05:54:05Z

This reverts commit 71c86ce59791bcd67af937bbea719a508079d7c2. The 21UX2 does have touchstrips, but they are in a somewhat- hidden location. Signed-off-by: Jason Gerecke Acked-by: Ping Cheng Signed-off-by: Dmitry Torokhov

Merge branch 'for-linus' of git://github.com/dtor/input

2011-09-16T21:09:19Z

* 'for-linus' of git://github.com/dtor/input: Input: wacom - fix touch parsing on newer Bamboos Input: bcm5974 - add MacBookAir4,1 trackpad support Input: wacom - add POINTER and DIRECT device properties Input: adp5588-keys - remove incorrect modalias Input: cm109 - fix checking return value of usb_control_msg Input: wacom - advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner Input: wacom - remove pressure for touch devices

Input: wacom - fix touch parsing on newer Bamboos

2011-09-13T05:08:59Z

Bamboos with Product ID's > 0xD4 return values unrelated to pressure in touch 1 pressure field. They also report 2nd touch X/Y values shifted down 1 byte (where pressure was). This results in jumpy 1 finger touch and totally invalid 2nd finger data. For touch detection, switch to a Touch Present single bit that all versions of Bamboo support. For touch 2 offset, calculate offset based on a bit that is set different between the two packet layouts. Since touch pressure reports were removed from driver, there was no need to be reading pressure any more. Signed-off-by: Chris Bagwell Reviewed-by: Ping Cheng Signed-off-by: Dmitry Torokhov

Input: bcm5974 - add MacBookAir4,1 trackpad support

2011-09-09T20:32:27Z

This patch adds trackpad support for the MacBookAir4,1, released in July 2011. It is very similar to the MacBookAir4,2 patch submitted by Joshua Dillon and Chase Douglas. Signed-off-by: Pieter-Augustijn Van Malleghem Signed-off-by: Dmitry Torokhov

Input: wacom - add POINTER and DIRECT device properties

2011-09-08T16:42:28Z

Adds INPUT_PROP_POINTER or INPUT_PROP_DIRECT as necessary to the hardware supported by the Wacom driver. The DIRECT property is assigned to devices with an embedded screen (i.e. touchscreens and display tablets). The POINTER property is assigned to those without embedded screens. Signed-off-by: Jason Gerecke Reviewed-by: Ping Cheng Signed-off-by: Dmitry Torokhov

Input: adp5588-keys - remove incorrect modalias

2011-08-27T06:40:14Z

For i2c drivers, we should use "i2c:" prefix for modalias. MODULE_DEVICE_TABLE will setup the modulalias for us, thus adding a MODULE_ALIAS is redundant (in addition to being incorrect). Signed-off-by: Axel Lin Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov

Input: cm109 - fix checking return value of usb_control_msg

2011-08-27T06:20:30Z

If successful, usb_control_msg returns the number of bytes transferred, otherwise a negative error number. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov

Input: wacom - advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner

2011-08-27T06:20:21Z

The Wacom PenPartner should advertise its stylus tip and button in addition to the eraser tool. These are both physically present on the hardware, and emitted from 'wacom_penpartner_irq'. Signed-off-by: Jason Gerecke Reviewed-by: Ping Cheng Signed-off-by: Dmitry Torokhov

Input: wacom - remove pressure for touch devices

2011-08-27T06:20:12Z

Touch devices do not report valid pressure or capacitance. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov