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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull HID subsystem fixes from Jiri Kosina:

- two device-specific quirks from Hans de Goede and Nic Soudée

- reintroduction of (mistakenly remocved) ABS_RESERVED from Peter
Hutterer

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
Input: restore EV_ABS ABS_RESERVED
HID: quirks: fix RetroUSB.com devices
HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk

Linus Torvalds 7 years ago f5d58277 9bb40f01

+19

4 changed files

expand all

drivers

hid

hid-ids.h

hid-ite.c

hid-quirks.c

include

uapi

linux

input-event-codes.h

drivers/hid/hid-ids.h

··· 17 17 #ifndef HID_IDS_H_FILE 18 18 #define HID_IDS_H_FILE 19 19 20 + #define USB_VENDOR_ID_258A 0x258a 21 + #define USB_DEVICE_ID_258A_6A88 0x6a88 22 + 20 23 #define USB_VENDOR_ID_3M 0x0596 21 24 #define USB_DEVICE_ID_3M1968 0x0500 22 25 #define USB_DEVICE_ID_3M2256 0x0502 ··· 943 940 944 941 #define USB_VENDOR_ID_REALTEK 0x0bda 945 942 #define USB_DEVICE_ID_REALTEK_READER 0x0152 943 + 944 + #define USB_VENDOR_ID_RETROUSB 0xf000 945 + #define USB_DEVICE_ID_RETROUSB_SNES_RETROPAD 0x0003 946 + #define USB_DEVICE_ID_RETROUSB_SNES_RETROPORT 0x00f1 946 947 947 948 #define USB_VENDOR_ID_ROCCAT 0x1e7d 948 949 #define USB_DEVICE_ID_ROCCAT_ARVO 0x30d4

drivers/hid/hid-ite.c

··· 42 42 43 43 static const struct hid_device_id ite_devices[] = { 44 44 { HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) }, 45 + { HID_USB_DEVICE(USB_VENDOR_ID_258A, USB_DEVICE_ID_258A_6A88) }, 45 46 { } 46 47 }; 47 48 MODULE_DEVICE_TABLE(hid, ite_devices);

drivers/hid/hid-quirks.c

··· 137 137 { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3003), HID_QUIRK_NOGET }, 138 138 { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008), HID_QUIRK_NOGET }, 139 139 { HID_USB_DEVICE(USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER), HID_QUIRK_NO_INIT_REPORTS }, 140 + { HID_USB_DEVICE(USB_VENDOR_ID_RETROUSB, USB_DEVICE_ID_RETROUSB_SNES_RETROPAD), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, 141 + { HID_USB_DEVICE(USB_VENDOR_ID_RETROUSB, USB_DEVICE_ID_RETROUSB_SNES_RETROPORT), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, 140 142 { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD), HID_QUIRK_BADPAD }, 141 143 { HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD2), HID_QUIRK_NO_INIT_REPORTS }, 142 144 { HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD), HID_QUIRK_NO_INIT_REPORTS },

include/uapi/linux/input-event-codes.h

··· 752 752 753 753 #define ABS_MISC 0x28 754 754 755 + /* 756 + * 0x2e is reserved and should not be used in input drivers. 757 + * It was used by HID as ABS_MISC+6 and userspace needs to detect if 758 + * the next ABS_* event is correct or is just ABS_MISC + n. 759 + * We define here ABS_RESERVED so userspace can rely on it and detect 760 + * the situation described above. 761 + */ 762 + #define ABS_RESERVED 0x2e 763 + 755 764 #define ABS_MT_SLOT 0x2f /* MT slot being modified */ 756 765 #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ 757 766 #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */