aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/tablet
AgeCommit message (Collapse)AuthorFilesLines
2012-10-03Input: wacom - allow any multi-input Intuos device to set proxJason Gerecke1-2/+2
The ability to set the proximity flag should apply to any device that has both pen and touch input. Rather than listing classes of devices known to meet this criteria, simply filter on the quirk defining all such devices. Signed-off-by: Jason Gerecke <[email protected]> Tested-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-10-03Input: wacom - report correct touch contact size for I5/BambooJason Gerecke1-4/+22
This changes how the touch packets for Intuos5 and 3rd-gen Bamboo are interpreted, so that proper values for the MAJOR and MINOR axes are reported. Instead of using the amplitude field (data[6]), we use the size field (data[5]) and do some calculation to transform it from a scaled-down area into axis lengths. Note that even though we assume a circular contact, both MAJOR and MINOR are reported since the resolution of the X and Y axes differ. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-10-01Merge branch 'for-next' of git://github.com/rydberg/linux into nextDmitry Torokhov1-3/+3
Merge Henrik's updates to multitouch code. Even though Jiri already pulled them in I need to do it too since my changes to evdev using dynamic major would clash with them.
2012-09-28Input: wacom - mark Intuos5 pad as in-prox when touching buttonsJason Gerecke1-1/+1
If the ExpressKeys on the Intuos5 are touched, they currently result an out-of-prox packet being sent even if the pad is already out of prox. This can cause some confusion in the X driver. To restore the expected semantics, we make being touched a sufficient condition to signal proximity. https://bugs.freedesktop.org/show_bug.cgi?id=54250 Reported-by: Timo Aaltonen <[email protected]> Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-09-19Input: MT - Add flags to input_mt_init_slots()Henrik Rydberg1-3/+3
Preparing to move more repeated code into the mt core, add a flags argument to the input_mt_slots_init() function. Reviewed-and-tested-by: Benjamin Tissoires <[email protected]> Tested-by: Ping Cheng <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Signed-off-by: Henrik Rydberg <[email protected]>
2012-09-04Input: wacom - add support for EMR on Cintiq 24HD touchJason Gerecke1-1/+5
Adds support for the EMR digitizer on the Cintiq 24HD touch. The EMR digitizer should work identically to that found on the Cintiq 24HD. The touch digitizer is a separate USB device similar to how we split apart some other devices. Signed-off-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-08-21Input: wacom - add support for EMR on Cintiq 24HD touchJason Gerecke1-1/+5
Adds support for the EMR digitizer on the Cintiq 24HD touch. The EMR digitizer should work identically to that found on the Cintiq 24HD. The touch digitizer is a separate USB device similar to how we split apart some other devices. Signed-off-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-07-24Input: wacom - add support to Cintiq 22HDPing Cheng2-3/+21
Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-07-13Input: hanwang - add support for Art Master II tabletweixing1-15/+42
This change adds support for old Hanwang Art master II tablet Signed-off-by: weixing <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-07-07Merge branch 'for-linus' to bring in change ensuring that drivers thatDmitry Torokhov1-2/+4
use threaded IRQs use IRQF_ONESHOT.
2012-07-04Merge commit 'v3.5-rc5' into nextDmitry Torokhov5-75/+104
2012-06-28Input: wacom - don't retrieve touch_max when it is predefinedPing Cheng1-1/+3
Some models, such as 0xE6, report more fingers than we process. Reported-by: Jonathan Nieder <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Tested-by: Nils Kanning <[email protected]> Tested-by: Rafi Rubin <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-06-28Input: wacom - fix retrieving touch_max bugPing Cheng1-1/+1
rep_data is not an array anymore, so taking it's address when passing to wacom_get_report() is wrong. Signed-off-by: Ping Cheng <[email protected]> Tested-by: Rafi Rubin <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-06-28Input: wacom - TPC2FG doesn't store touch id for slotsPing Cheng1-2/+4
Signed-off-by: Ping Cheng <[email protected]> Tested-by: Rafi Rubin <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-06-28Input: wacom - BTN_TOOL_DOUBLETAP is not a valid device_typePing Cheng1-1/+1
It is replaced by BTN_TOOL_FINGER. Signed-off-by: Ping Cheng <[email protected]> Tested-by: Rafi Rubin <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-06-12Input: wacom - remove code duplicationJason Gerecke1-4/+1
Replaces code to calculate Intuos5 physical dimensions with a call to an existing function that performs the same task. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-06-12Input: wacom - initialize and destroy LEDs for Intuos4 S tabletsJason Gerecke1-0/+2
This case appears to have been missed in the original commit. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-06-12Input: wacom - Bamboo One 1024 pressure fixChris Bagwell1-1/+1
Bamboo One's with ID of 0x6a and 0x6b were added with correct indication of 1024 pressure levels but the Graphire packet routine was only looking at 9 bits. Increased to 10 bits. This bug caused these devices to roll over to zero pressure at half way mark. The other devices using this routine only support 256 or 512 range and look to fix unused bits at zero. Signed-off-by: Chris Bagwell <[email protected]> Reported-by: Tushant Mirchandani <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-06-12Input: wacom - battery reporting improvementsChris Bagwell1-29/+53
Do not register battery device until connected to a tablet. This prevents an empty battery icon from being shown when tablet is connected using USB cable. Also, call power_supply_powers() for apps that can make use of that info. And stop ignoring input registration failures. Signed-off-by: Chris Bagwell <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-06-12Input: wacom - add two new devices (0xed and 0xef)Ping Cheng2-1/+14
0xed supports pen and one finger touch; 0xef is pen only. Signed-off-by: Ping Cheng <[email protected]> Acked-by: Chris Bagwell <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-06-12Input: wacom - rearrange type enumPing Cheng3-14/+8
So we can simplify a few type related if statements Signed-off-by: Ping Cheng <[email protected]> Acked-by: Chris Bagwell <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-05-24Merge branch 'for-linus' of ↵Linus Torvalds5-110/+457
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input layer updates from Dmitry Torokhov: - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics Navpoint, LM8333 keypads, Wacom I2C touhscreen); - updates to existing touchpad drivers (ALPS, Sntelic); - Wacom driver now supports Intuos5; - device-tree bindings in numerous drivers; - other cleanups and fixes. Fix annoying conflict in drivers/input/tablet/wacom_wac.c that I think implies that the input layer device naming is broken, but let's see. I brough it up with Dmitry. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits) Input: matrix-keymap - fix building keymaps Input: spear-keyboard - document DT bindings Input: spear-keyboard - add device tree bindings Input: matrix-keymap - wire up device tree support Input: matrix-keymap - uninline and prepare for device tree support Input: adp5588 - add support for gpio names Input: omap-keypad - dynamically handle register offsets Input: synaptics - fix compile warning MAINTAINERS: adjust input-related patterns Input: ALPS - switch to using input_mt_report_finger_count Input: ALPS - add semi-MT support for v4 protocol Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver Input: atmel_mxt_ts - dump each message on just 1 line Input: atmel_mxt_ts - do not read extra (checksum) byte Input: atmel_mxt_ts - verify object size in mxt_write_object Input: atmel_mxt_ts - only allow root to update firmware Input: atmel_mxt_ts - use CONFIG_PM_SLEEP Input: sentelic - report device's production serial number Input: tl6040-vibra - Device Tree support Input: evdev - properly handle read/write with count 0 ...
2012-05-04USB: input: wacom_sys.c: fix up dev_* messagesGreg Kroah-Hartman1-2/+2
Previously I had made the struct device point to the input device, but after talking with Dmitry, he said that the USB device would make more sense for this driver to point to. So converted it to use that instead. CC: Dmitry Torokhov <[email protected]> CC: Ping Cheng <[email protected]> CC: Chris Bagwell <[email protected]> CC: Eduard Hasenleithner <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-04USB: input: kbtab.c: fix up dev_* messagesGreg Kroah-Hartman1-3/+7
Previously I had made the struct device point to the input device, but after talking with Dmitry, he said that the USB device would make more sense for this driver to point to. So converted it to use that instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-04USB: input: gtco.c: fix up dev_* messagesGreg Kroah-Hartman1-3/+5
Previously I had made the struct device point to the input device, but after talking with Dmitry, he said that the USB device would make more sense for this driver to point to. So converted it to use that instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-04USB: input: aiptek.c: fix up dev_* messagesGreg Kroah-Hartman1-8/+9
Previously I had made the struct device point to the input device, but after talking with Dmitry, he said that the USB device would make more sense for this driver to point to. So converted it to use that instead. CC: Dmitry Torokhov <[email protected]> CC: Jesper Juhl <[email protected]> CC: JJ Ding <[email protected]> CC: Edwin van Vliet <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-04USB: input: acecad.c: fix up dev_* messagesGreg Kroah-Hartman1-3/+6
Previously I had made the struct device point to the input device, but after talking with Dmitry, he said that the USB device would make more sense for this driver to point to. So converted it to use that instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-02Input: wacom - use dev_xxx() instead of naked printk()s and dbg()sDmitry Torokhov2-17/+27
Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-05-02Input: wacom - return proper error if usb_get_extra_descriptor() failsDmitry Torokhov1-5/+6
Instead of returning 1 (which is not even negative) let's capture and return error codde returned by usb_get_extra_descriptor(). Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-05-02Input: wacom - fix sparse warningDmitry Torokhov1-2/+2
This fixes the following warning from sparse warning: Using plain integer as NULL pointer Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-05-01USB: kbtab.c: remove dbg() usageGreg Kroah-Hartman1-2/+4
dbg() was a very old USB-specific macro that should no longer be used. This patch removes it from being used in the driver and uses dev_dbg() instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-01USB: gtco.c: remove dbg() usageGreg Kroah-Hartman1-42/+45
dbg() was a very old USB-specific macro that should no longer be used. This patch removes it from being used in the driver and uses dev_dbg() instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-01USB: aiptek.c: remove dbg() usageGreg Kroah-Hartman1-9/+13
dbg() was a very old USB-specific macro that should no longer be used. This patch removes it from being used in the driver and uses dev_dbg() instead. CC: Dmitry Torokhov <[email protected]> CC: Jesper Juhl <[email protected]> CC: JJ Ding <[email protected]> CC: Edwin van Vliet <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-01USB: acecad.c: remove dbg() usageGreg Kroah-Hartman1-2/+4
dbg() was a very old USB-specific macro that should no longer be used. This patch removes it from being used in the driver and uses dev_dbg() instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-01USB: wacom: remove dbg() usageGreg Kroah-Hartman2-9/+17
dbg() was a very old USB-specific macro that should no longer be used. This patch removes it from being used in the driver and uses dev_dbg() instead. Cc: Dmitry Torokhov <[email protected]> Cc: Ping Cheng <[email protected]> Cc: Eduard Hasenleithner <[email protected]> Cc: Chris Bagwell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-01USB: input: wacom_sys.c: fix up dev_err() usageGreg Kroah-Hartman1-2/+2
We should always reference the input device for dev_err(), not the USB device. Fix up the places where I got this wrong. Reported-by: Dmitry Torokhov <[email protected]> CC: Ping Cheng <[email protected]> CC: Chris Bagwell <[email protected]> CC: Eduard Hasenleithner <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-01USB: input: kbtab.c: fix up dev_err() usageGreg Kroah-Hartman1-1/+1
We should always reference the input device for dev_err(), not the USB device. Fix up the places where I got this wrong. Reported-by: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-01USB: input: gtco.c: fix up dev_err() usageGreg Kroah-Hartman1-1/+1
We should always reference the input device for dev_err(), not the USB device. Fix up the places where I got this wrong. Reported-by: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-01USB: input: aiptek.c: fix up dev_err() usageGreg Kroah-Hartman1-1/+1
We should always reference the input device for dev_err(), not the USB device. Fix up the places where I got this wrong. Reported-by: Dmitry Torokhov <[email protected]> CC: Jesper Juhl <[email protected]> CC: JJ Ding <[email protected]> CC: Edwin van Vliet <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-01USB: input: acecad.c: fix up dev_err() usageGreg Kroah-Hartman1-1/+1
We should always reference the input device for dev_err(), not the USB device. Fix up the places where I got this wrong. Reported-by: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-29Input: wacom - add 0xE5 (MT device) supportPing Cheng4-45/+157
Main part of patch is adding support for a new Wacom MT touch packet and labels these devices using MTSCREEN type. Other items of interest: Delete some duplicate code in HID parsing for Y info since its already done in X path. In wacom_query_tablet_data(), only invoke the set report that requests tablets to send Wacom Touch packets for Finger interfaces. Mostly, this is to make code intent clear. Tested-by: Jason Gerecke <[email protected]> Signed-off-by: Chris Bagwell <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-29Input: wacom - retrieve maximum number of touch pointsPing Cheng3-24/+65
From the HID usage table when it is supported. Tested-by: Jason Gerecke <[email protected]> Signed-off-by: Chris Bagwell <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-25USB: wacom_sys.c: remove err() usageGreg Kroah-Hartman1-2/+3
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> CC: Ping Cheng <[email protected]> CC: Chris Bagwell <[email protected]> CC: Eduard Hasenleithner <[email protected]> CC: Jason Gerecke <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: kbtab.c: remove err() usageGreg Kroah-Hartman1-2/+3
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: gtco.c: remove err() usageGreg Kroah-Hartman1-10/+11
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: aiptek.c: remove err() usageGreg Kroah-Hartman1-2/+3
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> CC: Jesper Juhl <[email protected]> CC: JJ Ding <[email protected]> CC: Edwin van Vliet <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-25USB: acecad.c: remove err() usageGreg Kroah-Hartman1-2/+4
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Dmitry Torokhov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-04-23Input: aiptek - adjust error-handling code labelJulia Lawall1-1/+1
At the point of this error-handling code, aiptek->urb has been allocated, and it does not appear to be less necessary to free it here than in the error-handling code just below. Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-04-21Merge commit 'v3.4-rc4' into nextDmitry Torokhov3-1/+5
2012-04-04Input: wacom - add Intuos5 multitouch sensor supportJason Gerecke2-5/+84
Intuos5 tablets with PTH-* model numbers include a multitouch sensor which use the same touch reports as the 3rd-generation Bamboo. No useful information is in the HID descriptor for the touch interface so hardcoded values are used during setup. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.