Commit a6802e00 authored by Forest Bond's avatar Forest Bond Committed by Jiri Kosina
Browse files

HID: hid-multitouch: add support for SiS panels 



Add support for SiS multitouch panels.

Signed-off-by: default avatarForest Bond <forest.bond@rapidrollout.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 7b226292

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ config HID_MULTITOUCH 
	  - Pixcir dual touch panels

	  - Quanta panels

	  - eGalax dual-touch panels, including the Joojoo and Wetab tablets

	  - SiS multitouch panels

	  - Stantum multitouch panels

	  - Touch International Panels

	  - Unitec Panels

drivers/hid/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1814,6 +1814,8 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },

drivers/hid/hid-ids.h

+4 −0
Original line number Diff line number Diff line
@@ -748,6 +748,10 @@ 
#define USB_VENDOR_ID_SIGMATEL		0x066F

#define USB_DEVICE_ID_SIGMATEL_STMP3780	0x3780



#define USB_VENDOR_ID_SIS2_TOUCH	0x0457

#define USB_DEVICE_ID_SIS9200_TOUCH	0x9200

#define USB_DEVICE_ID_SIS817_TOUCH	0x0817



#define USB_VENDOR_ID_SKYCABLE			0x1223

#define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07

drivers/hid/hid-multitouch.c

+8 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,14 @@ static const struct hid_device_id mt_devices[] = { 
		MT_USB_DEVICE(USB_VENDOR_ID_QUANTA,

			USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008) },



	/* SiS panels */

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH,

		USB_DEVICE_ID_SIS9200_TOUCH) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH,

		USB_DEVICE_ID_SIS817_TOUCH) },



	/* Stantum panels */

	{ .driver_data = MT_CLS_CONFIDENCE,

		MT_USB_DEVICE(USB_VENDOR_ID_STANTUM,

drivers/hid/usbhid/hid-quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH, 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_2, HID_QUIRK_NOGET },