aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-11-24 00:15:57 -0500
committerJiri Kosina <jkosina@suse.cz>2012-11-26 08:20:35 -0500
commit436136cec650d661eb662fcb508a99878606d050 (patch)
treec750f862718c8110331320d463af42a39a728f31 /drivers/hid
parente3bbe8755c9c947d80f88c8a2a81073dbc01bd1f (diff)
HID: add quirk for Freescale i.MX23 ROM recovery
The USB recovery mode present in i.MX23 ROM emulates USB HID. It needs this quirk to behave properly. Even if the official branding of the chip is Freescale i.MX23, I named it Sigmatel STMP3780 since that's what the chip really is and it even reports itself as STMP3780. Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/usbhid/hid-quirks.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index c638e5d5a5cd..74d47aa4c5a1 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -697,6 +697,9 @@
697#define USB_VENDOR_ID_SIGMA_MICRO 0x1c4f 697#define USB_VENDOR_ID_SIGMA_MICRO 0x1c4f
698#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD 0x0002 698#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD 0x0002
699 699
700#define USB_VENDOR_ID_SIGMATEL 0x066F
701#define USB_DEVICE_ID_SIGMATEL_STMP3780 0x3780
702
700#define USB_VENDOR_ID_SKYCABLE 0x1223 703#define USB_VENDOR_ID_SKYCABLE 0x1223
701#define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 704#define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07
702 705
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 38a7cdd536b9..3715043244dd 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -79,6 +79,7 @@ static const struct hid_blacklist {
79 { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET }, 79 { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET },
80 { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET }, 80 { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
81 { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET }, 81 { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
82 { USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET },
82 { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, 83 { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
83 { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET }, 84 { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
84 { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET }, 85 { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },