Commit 11576c61 authored by Masatoshi Hoshikawa's avatar Masatoshi Hoshikawa Committed by Jiri Kosina
Browse files

HID: hid-multitouch: add support 9 new Xiroku devices 



This patch adds support for the Xiroku Inc. panels (SPX/MPX/CSR/etc.).

Signed-off-by: default avatarMasatoshi Hoshikawa <hoshikawa@xiroku.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c4fad877

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ config HID_MULTITOUCH 
	  - Touch International Panels

	  - Unitec Panels

	  - XAT optical touch panels

	  - Xiroku optical touch panels



	  If unsure, say N.

drivers/hid/hid-core.c

+9 −0
Original line number Diff line number Diff line
@@ -1555,6 +1555,15 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XAT, USB_DEVICE_ID_XAT_CSR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_SPX) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_MPX) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_SPX1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_MPX1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_SPX2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_MPX2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },

drivers/hid/hid-ids.h

+11 −0
Original line number Diff line number Diff line
@@ -724,6 +724,17 @@ 
#define USB_VENDOR_ID_XAT	0x2505

#define USB_DEVICE_ID_XAT_CSR	0x0220



#define USB_VENDOR_ID_XIROKU		0x1477

#define USB_DEVICE_ID_XIROKU_SPX	0x1006

#define USB_DEVICE_ID_XIROKU_MPX	0x1007

#define USB_DEVICE_ID_XIROKU_CSR	0x100e

#define USB_DEVICE_ID_XIROKU_SPX1	0x1021

#define USB_DEVICE_ID_XIROKU_CSR1	0x1022

#define USB_DEVICE_ID_XIROKU_MPX1	0x1023

#define USB_DEVICE_ID_XIROKU_SPX2	0x1024

#define USB_DEVICE_ID_XIROKU_CSR2	0x1025

#define USB_DEVICE_ID_XIROKU_MPX2	0x1026



#define USB_VENDOR_ID_YEALINK		0x6993

#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K	0xb001

drivers/hid/hid-multitouch.c

+29 −0
Original line number Diff line number Diff line
@@ -854,6 +854,35 @@ static const struct hid_device_id mt_devices[] = { 
		HID_USB_DEVICE(USB_VENDOR_ID_XAT,

			USB_DEVICE_ID_XAT_CSR) },



	/* Xiroku */

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,

			USB_DEVICE_ID_XIROKU_SPX) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,

			USB_DEVICE_ID_XIROKU_MPX) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,

			USB_DEVICE_ID_XIROKU_CSR) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,

			USB_DEVICE_ID_XIROKU_SPX1) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,

			USB_DEVICE_ID_XIROKU_MPX1) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,

			USB_DEVICE_ID_XIROKU_CSR1) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,

			USB_DEVICE_ID_XIROKU_SPX2) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,

			USB_DEVICE_ID_XIROKU_MPX2) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,

			USB_DEVICE_ID_XIROKU_CSR2) },



	{ }

};

MODULE_DEVICE_TABLE(hid, mt_devices);