Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b6dc79929fa18a97bbc08400db72405ad835622f

Authored by Pascal Auriel - Stantum
Committed by Jiri Kosina
1 parent 8038298fde
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 10 additions and 0 deletions Side-by-side Diff

drivers/hid/hid-core.c
Diff comments   View file @ b6dc799
... ... @@ -1377,6 +1377,8 @@
1377 1377 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
1378 1378 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
1379 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 1382 { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
1381 1383 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
1382 1384 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
drivers/hid/hid-ids.h
Diff comments   View file @ b6dc799
... ... @@ -483,6 +483,12 @@
483 483 #define USB_VENDOR_ID_STANTUM 0x1f87
484 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 492 #define USB_VENDOR_ID_SUN 0x0430
487 493 #define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab
488 494  
drivers/hid/hid-stantum.c
Diff comments   View file @ b6dc799
... ... @@ -249,6 +249,8 @@
249 249  
250 250 static const struct hid_device_id stantum_devices[] = {
251 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 256 MODULE_DEVICE_TABLE(hid, stantum_devices);