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
This commit is contained in:
commit
61c901c569
|
@ -386,6 +386,7 @@ config HID_MULTITOUCH
|
||||||
- Unitec Panels
|
- Unitec Panels
|
||||||
- XAT optical touch panels
|
- XAT optical touch panels
|
||||||
- Xiroku optical touch panels
|
- Xiroku optical touch panels
|
||||||
|
- Zytronic touch panels
|
||||||
|
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
|
|
|
@ -659,6 +659,9 @@
|
||||||
#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
|
#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
|
||||||
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600
|
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600
|
||||||
|
|
||||||
|
#define USB_VENDOR_ID_SENNHEISER 0x1395
|
||||||
|
#define USB_DEVICE_ID_SENNHEISER_BTD500USB 0x002c
|
||||||
|
|
||||||
#define USB_VENDOR_ID_SIGMA_MICRO 0x1c4f
|
#define USB_VENDOR_ID_SIGMA_MICRO 0x1c4f
|
||||||
#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD 0x0002
|
#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD 0x0002
|
||||||
|
|
||||||
|
@ -808,6 +811,9 @@
|
||||||
#define USB_VENDOR_ID_ZYDACRON 0x13EC
|
#define USB_VENDOR_ID_ZYDACRON 0x13EC
|
||||||
#define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006
|
#define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006
|
||||||
|
|
||||||
|
#define USB_VENDOR_ID_ZYTRONIC 0x14c8
|
||||||
|
#define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005
|
||||||
|
|
||||||
#define USB_VENDOR_ID_PRIMAX 0x0461
|
#define USB_VENDOR_ID_PRIMAX 0x0461
|
||||||
#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
|
#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
|
||||||
|
|
||||||
|
|
|
@ -301,6 +301,9 @@ static const struct hid_device_id hid_battery_quirks[] = {
|
||||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
|
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
|
||||||
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),
|
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),
|
||||||
HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
|
HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
|
||||||
|
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
|
||||||
|
USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
|
||||||
|
HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1048,6 +1048,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||||
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
|
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
|
||||||
USB_DEVICE_ID_XIROKU_CSR2) },
|
USB_DEVICE_ID_XIROKU_CSR2) },
|
||||||
|
|
||||||
|
/* Zytronic panels */
|
||||||
|
{ .driver_data = MT_CLS_SERIAL,
|
||||||
|
MT_USB_DEVICE(USB_VENDOR_ID_ZYTRONIC,
|
||||||
|
USB_DEVICE_ID_ZYTRONIC_ZXY100) },
|
||||||
|
|
||||||
/* Generic MT device */
|
/* Generic MT device */
|
||||||
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },
|
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },
|
||||||
{ }
|
{ }
|
||||||
|
|
|
@ -76,6 +76,7 @@ static const struct hid_blacklist {
|
||||||
{ USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
|
{ USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
|
||||||
{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
|
{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
|
||||||
{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
|
{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
|
||||||
|
{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
|
||||||
{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
|
{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
|
||||||
{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
|
{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
|
||||||
{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },
|
{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },
|
||||||
|
|
Loading…
Reference in a new issue