diff options
author | Pascal Auriel - Stantum <P.Auriel@stantum.com> | 2010-10-01 10:01:28 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-01 10:01:34 -0400 |
commit | b6dc79929fa18a97bbc08400db72405ad835622f (patch) | |
tree | 09659cba0b4a57a13a669f6e7cd766a191d1ccf8 /drivers/hid | |
parent | 8038298fde28a533da52a47fac87106b4bf9816c (diff) |
HID: support STmicroelectronics and Sitronix with hid-stantuml driver
New VendorsIds/ProductIds using hid-stantum driver.
Signed-off-by: Stantum <software@stantum.com>
Acked-by: Stephane Chatty <chatty@enac.fr>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-core.c | 2 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 6 | ||||
-rw-r--r-- | drivers/hid/hid-stantum.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index e8c446de8ed0..000e0f423ae5 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1377,6 +1377,8 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1377 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, | 1377 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, |
1378 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, | 1378 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, |
1379 | { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) }, | 1379 | { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) }, |
1380 | { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) }, | ||
1381 | { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) }, | ||
1380 | { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) }, | 1382 | { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) }, |
1381 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) }, | 1383 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) }, |
1382 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) }, | 1384 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 49ec747f6bb9..6033229a8c7f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -483,6 +483,12 @@ | |||
483 | #define USB_VENDOR_ID_STANTUM 0x1f87 | 483 | #define USB_VENDOR_ID_STANTUM 0x1f87 |
484 | #define USB_DEVICE_ID_MTP 0x0002 | 484 | #define USB_DEVICE_ID_MTP 0x0002 |
485 | 485 | ||
486 | #define USB_VENDOR_ID_STANTUM_STM 0x0483 | ||
487 | #define USB_DEVICE_ID_MTP_STM 0x3261 | ||
488 | |||
489 | #define USB_VENDOR_ID_STANTUM_SITRONIX 0x1403 | ||
490 | #define USB_DEVICE_ID_MTP_SITRONIX 0x5001 | ||
491 | |||
486 | #define USB_VENDOR_ID_SUN 0x0430 | 492 | #define USB_VENDOR_ID_SUN 0x0430 |
487 | #define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab | 493 | #define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab |
488 | 494 | ||
diff --git a/drivers/hid/hid-stantum.c b/drivers/hid/hid-stantum.c index 90df886c5e04..3171be28c3d5 100644 --- a/drivers/hid/hid-stantum.c +++ b/drivers/hid/hid-stantum.c | |||
@@ -249,6 +249,8 @@ static void stantum_remove(struct hid_device *hdev) | |||
249 | 249 | ||
250 | static const struct hid_device_id stantum_devices[] = { | 250 | static const struct hid_device_id stantum_devices[] = { |
251 | { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) }, | 251 | { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) }, |
252 | { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) }, | ||
253 | { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) }, | ||
252 | { } | 254 | { } |
253 | }; | 255 | }; |
254 | MODULE_DEVICE_TABLE(hid, stantum_devices); | 256 | MODULE_DEVICE_TABLE(hid, stantum_devices); |