diff mbox

hid: support STmicroelectronics and Sitronix with hid-stantuml driver

Message ID 39DA9B419B56B14AB97E543A876B0ECF195F57B883@stantum-exch.stantum.local (mailing list archive)
State Accepted
Commit b6dc79929fa18a97bbc08400db72405ad835622f
Headers show

Commit Message

Pascal Auriel - Stantum Oct. 1, 2010, 11:26 a.m. UTC 
None
diff mbox

Patch

diff -rupN before/drivers/hid/hid-core.c after/drivers/hid/hid-core.c
--- before/drivers/hid/hid-core.c	2010-10-01 13:01:34.485323002 +0200
+++ after/drivers/hid/hid-core.c	2010-10-01 13:04:23.869323000 +0200
@@ -1376,6 +1376,8 @@  static const struct hid_device_id hid_bl
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
diff -rupN before/drivers/hid/hid-ids.h after/drivers/hid/hid-ids.h
--- before/drivers/hid/hid-ids.h	2010-10-01 13:01:47.085323001 +0200
+++ after/drivers/hid/hid-ids.h	2010-10-01 13:04:33.285323000 +0200
@@ -481,6 +481,12 @@ 
 #define USB_VENDOR_ID_STANTUM		0x1f87
 #define USB_DEVICE_ID_MTP		0x0002
 
+#define USB_VENDOR_ID_STANTUM_STM		0x0483
+#define USB_DEVICE_ID_MTP_STM		0x3261
+
+#define USB_VENDOR_ID_STANTUM_SITRONIX		0x1403
+#define USB_DEVICE_ID_MTP_SITRONIX		0x5001
+
 #define USB_VENDOR_ID_SUN		0x0430
 #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab
 
diff -rupN before/drivers/hid/hid-stantum.c after/drivers/hid/hid-stantum.c
--- before/drivers/hid/hid-stantum.c	2010-10-01 13:01:40.181323000 +0200
+++ after/drivers/hid/hid-stantum.c	2010-10-01 13:04:43.717323001 +0200
@@ -249,6 +249,8 @@  static void stantum_remove(struct hid_de
 
 static const struct hid_device_id stantum_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, stantum_devices);