diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 11:08:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 11:08:25 -0800 |
| commit | f39fdf2ab846ecc636d6272b47f28a05a2052a14 (patch) | |
| tree | dfe4cd1ade490e1218660780d422045631ea96a4 /include | |
| parent | 775a2e29c3bbcf853432f47d3caa9ff8808807ad (diff) | |
| parent | 96e132ebc0a162c643e0e6e6f1f85c3be3355715 (diff) | |
| download | talos-op-linux-f39fdf2ab846ecc636d6272b47f28a05a2052a14.tar.gz talos-op-linux-f39fdf2ab846ecc636d6272b47f28a05a2052a14.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID updates from Jiri Kosina:
- support for new Wacom "MobileStudio Pro" class of tablets from Jason
Gerecke
- Microsoft Surface 3 support from Benjamin Tissoires and Microsoft
Surface 4 support from Daniel Keller
- uDraw PS3 tablet support from Bastien Nocera
- timeout scheduling fixes for intel-ish-hid from Even Xu
- HID_QUIRK_MULTI_INPUT in order to simplify LED handling from Benjamin
Tissoires
- support for Sony DS4 dongle and various other fixes to Sony driver
from Roderick Colenbrander
- other assorted smaller fixes and device ID additions
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (63 commits)
HID: fix missing irq field
HID: i2c-hid: fix build
HID: i2c-hid: Disable IRQ before freeing buffers
HID: usbhid: fix improper return value
HID: wacom: generic: Don't sync input on empty input packets
HID: wacom: generic: Pad supports more than buttons
HID: wacom: generic: Send data only when the interface is defined
HID: wacom: generic: Don't return a value for wacom_wac_event
HID: intel_ish-hid: use %pUL for uuid formatting
HID: cp2112: explicitly require irqchip support in gpiolib
HID: asus: Add i2c touchpad support
HID: intel-ish-hid: Fix potential race condition
HID: sony: Support DS4 dongle
HID: sony: Comply to Linux gamepad spec for DS4
HID: sony: Make the DS4 touchpad a separate device
HID: sony: Fix memory issue when connecting device using both Bluetooth and USB
HID: cp2112: add IRQ chip handling
HID: i2c-hid: force the IRQ level trigger only when not set
HID: multitouch: do not retrieve all reports for all devices
HID: multitouch: enable the Surface 3 Type Cover to report multitouch data
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index b2ec82712baa..28f38e2b8f30 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -231,7 +231,11 @@ struct hid_item { #define HID_DG_TAP 0x000d0035 #define HID_DG_TABLETFUNCTIONKEY 0x000d0039 #define HID_DG_PROGRAMCHANGEKEY 0x000d003a +#define HID_DG_BATTERYSTRENGTH 0x000d003b #define HID_DG_INVERT 0x000d003c +#define HID_DG_TILT_X 0x000d003d +#define HID_DG_TILT_Y 0x000d003e +#define HID_DG_TWIST 0x000d0041 #define HID_DG_TIPSWITCH 0x000d0042 #define HID_DG_TIPSWITCH2 0x000d0043 #define HID_DG_BARRELSWITCH 0x000d0044 @@ -479,6 +483,7 @@ struct hid_input { struct list_head list; struct hid_report *report; struct input_dev *input; + bool registered; }; enum hid_type { |

