summaryrefslogtreecommitdiffstats
path: root/drivers/hid/wacom_wac.c
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'for-4.3/upstream-fixes', 'for-4.4/corsair', 'for-4.4/dragonri...Jiri Kosina2015-11-061-39/+124
|\ \
| | * HID: wacom: Fix ABS_MISC reporting for Cintiq Companion 2Jason Gerecke2015-11-031-1/+1
| | * HID: wacom: fix Intuos wireless report id issuePing Cheng2015-11-021-1/+0
| | * HID: wacom: Report full pressure range for Intuos, Cintiq 13HD TouchJason Gerecke2015-10-211-1/+1
| | * HID: wacom: Add support for Cintiq Companion 2Jason Gerecke2015-10-211-1/+35
| | * HID: wacom: Add four new Intuos devicesPing Cheng2015-09-231-24/+73
| | * HID: wacom: Cleanup unsupported device_type for BAMBOO_PTPing Cheng2015-09-231-14/+17
| |/
* | HID: wacom: Expect 'touch_max' touches if HID_DG_CONTACTCOUNT not presentJason Gerecke2015-10-211-2/+2
* | HID: wacom: Tie cached HID_DG_CONTACTCOUNT indices to report IDJason Gerecke2015-10-211-0/+26
|/
*-. Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4...Jiri Kosina2015-09-011-174/+330
|\ \
| | * HID: wacom: wacom_setup_numbered_buttons is local to wacom_wacJiri Kosina2015-08-281-1/+1
| | * HID: wacom: Add support for Express Key Remote.Aaron Skomra2015-08-281-0/+144
| | * HID: wacom: Set button bits based on a new numbered_buttonsAaron Skomra2015-08-281-115/+60
| | * HID: wacom: Use tablet-provided touch height/width values for INTUOSHTJason Gerecke2015-08-181-1/+1
| | * HID: wacom: Simplify 'wacom_pl_irq'Jason Gerecke2015-08-111-49/+35
| | * HID: wacom: Remove WACOM_QUIRK_NO_INPUTJason Gerecke2015-08-041-4/+0
| | * HID: wacom: Replace WACOM_QUIRK_MONITOR with WACOM_DEVICETYPE_WL_MONITORJason Gerecke2015-08-041-3/+1
| | * HID: wacom: Report touch width/height/orientation for GENERIC devicesJason Gerecke2015-07-231-0/+20
| | * HID: wacom: Ignore contacts in excess of declared contact countJason Gerecke2015-07-231-1/+29
| | * HID: wacom: Perform all event processing as part of report processingJason Gerecke2015-07-231-0/+39
| | * HID: wacom: remove the extra Pen interface for Wacom Bamboo PADBenjamin Tissoires2015-07-131-2/+2
| |/
* / HID: wacom: Enable pad device for older Bamboo Touch tabletsJason Gerecke2015-07-081-0/+3
|/
*-. Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'f...Jiri Kosina2015-06-221-181/+238
|\ \
| | * HID: wacom: Introduce new 'touch_input' deviceJason Gerecke2015-06-181-52/+63
| | * HID: wacom: Split apart 'wacom_setup_pentouch_input_capabilites'Jason Gerecke2015-06-181-112/+122
| | * HID: wacom: Introduce a new WACOM_DEVICETYPE_PAD device_typeJason Gerecke2015-06-181-34/+37
| | * HID: wacom: Treat features->device_type values as flagsJason Gerecke2015-06-181-15/+15
| | * HID: wacom: Discover device_type from HID descriptor for all devicesJason Gerecke2015-05-041-3/+5
| | * HID: wacom: Add support for DTU-1141Aaron Skomra2015-04-231-0/+4
| | * HID: wacom: Simplify check for presence of single-finger touchJason Gerecke2015-04-231-3/+2
| | * HID: wacom: move all quirks to wacom_setup_device_quirksPing Cheng2015-04-231-1/+29
| |/
* / HID: wacom: fix an Oops caused by wacom_wac_finger_count_touchesPing Cheng2015-05-201-0/+3
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2015-04-141-131/+275
|\
| * HID: wacom: Add support for Cintiq 13HD TouchPing Cheng2015-04-021-0/+11
| * HID: wacom: set stylus_in_proximity before checking touch_downPing Cheng2015-04-021-18/+16
| * HID: wacom: use wacom_wac_finger_count_touches to set touch_downPing Cheng2015-04-021-51/+33
| * HID: wacom: remove hardcoded WACOM_QUIRK_MULTI_INPUTPing Cheng2015-04-021-14/+4
| * Merge branch 'for-4.0/upstream-fixes' into for-4.1/wacomJiri Kosina2015-04-021-36/+59
| |\ | |/ |/|
| * HID: wacom: ask for a in-prox report when it was missedBenjamin Tissoires2015-03-161-1/+17
| * HID: wacom: Add battery presence indicator to wireless tabletsJason Gerecke2015-03-111-6/+10
| * HID: wacom: Status packet provides 'charging', not 'powered' bitJason Gerecke2015-03-111-9/+5
| * HID: wacom: Report battery status for Intuos Pro and Intuos5Jason Gerecke2015-03-111-0/+2
| * HID: wacom: Provide battery charge state to system over USB if availableJason Gerecke2015-03-111-0/+25
| * HID: wacom: Centralize updating of wacom_wac battery statusJason Gerecke2015-03-111-28/+29
| * HID: wacom: Move handling of Intuos status packets to seperate functionJason Gerecke2015-03-111-13/+23
| * HID: wacom: add full support of the Wacom Bamboo PADBenjamin Tissoires2015-02-271-0/+104
| * HID: wacom: Add support for I2C connected devicesMika Westerberg2015-02-241-0/+5
| * HID: wacom: do not directly use input_mt_report_pointer_emulationBenjamin Tissoires2015-02-181-5/+5
* | HID: wacom: check for wacom->shared before following the pointerBenjamin Tissoires2015-03-171-3/+4
* | HID: wacom: rely on actual touch down count to decide touch_downPing Cheng2015-03-031-32/+43