Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID update from Jiri Kosina:
"A final round of changes for HID for 3.5: just device ID additions."
* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: hid-multitouch: add support for Zytronic panels
HID: add Sennheiser BTD500USB device support
HID: add battery quirk for Apple Wireless ANSI
+16
+1
drivers/hid/Kconfig
+1
drivers/hid/Kconfig
+6
drivers/hid/hid-ids.h
+6
drivers/hid/hid-ids.h
···
659
659
#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
660
660
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600
661
661
662
+
#define USB_VENDOR_ID_SENNHEISER 0x1395
663
+
#define USB_DEVICE_ID_SENNHEISER_BTD500USB 0x002c
664
+
662
665
#define USB_VENDOR_ID_SIGMA_MICRO 0x1c4f
663
666
#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD 0x0002
664
667
···
810
807
811
808
#define USB_VENDOR_ID_ZYDACRON 0x13EC
812
809
#define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006
810
+
811
+
#define USB_VENDOR_ID_ZYTRONIC 0x14c8
812
+
#define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005
813
813
814
814
#define USB_VENDOR_ID_PRIMAX 0x0461
815
815
#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
+3
drivers/hid/hid-input.c
+3
drivers/hid/hid-input.c
···
301
301
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
302
302
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),
303
303
HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
304
+
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
305
+
USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
306
+
HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
304
307
{}
305
308
};
306
309
+5
drivers/hid/hid-multitouch.c
+5
drivers/hid/hid-multitouch.c
···
1048
1048
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
1049
1049
USB_DEVICE_ID_XIROKU_CSR2) },
1050
1050
1051
+
/* Zytronic panels */
1052
+
{ .driver_data = MT_CLS_SERIAL,
1053
+
MT_USB_DEVICE(USB_VENDOR_ID_ZYTRONIC,
1054
+
USB_DEVICE_ID_ZYTRONIC_ZXY100) },
1055
+
1051
1056
/* Generic MT device */
1052
1057
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },
1053
1058
{ }
+1
drivers/hid/usbhid/hid-quirks.c
+1
drivers/hid/usbhid/hid-quirks.c
···
76
76
{ USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
77
77
{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
78
78
{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
79
+
{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
79
80
{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
80
81
{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
81
82
{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },