Commit 8f685fbd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hid-multitouch: minor fixes based on additional review
  HID: Switch turbox/mosart touchscreen to hid-mosart
  HID: add Add Cando touch screen 10.1-inch product id
  HID: hid-mulitouch: add support for the 'Sensing Win7-TwoFinger'
  HID: hid-multitouch: add support for Cypress TrueTouch panels
  HID: hid-multitouch: support for PixCir-based panels
  HID: set HID_MAX_FIELD at 128
  HID: add feature_mapping callback
parents d24450e2 2d93666e

drivers/hid/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -295,6 +295,23 @@ config HID_MONTEREY 
	---help---

	Support for Monterey Genius KB29E.



config HID_MULTITOUCH

	tristate "HID Multitouch panels"

	depends on USB_HID

	---help---

	  Generic support for HID multitouch panels.



	  Say Y here if you have one of the following devices:

	  - Cypress TrueTouch panels

	  - Hanvon dual touch panels

	  - Pixcir dual touch panels

	  - 'Sensing Win7-TwoFinger' panel by GeneralTouch



	  If unsure, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called hid-multitouch.



config HID_NTRIG

	tristate "N-Trig touch screen"

	depends on USB_HID

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o 
obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o

obj-$(CONFIG_HID_MOSART)	+= hid-mosart.o

obj-$(CONFIG_HID_MULTITOUCH)	+= hid-multitouch.o

obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o

obj-$(CONFIG_HID_ORTEK)		+= hid-ortek.o

obj-$(CONFIG_HID_PRODIKEYS)	+= hid-prodikeys.o

drivers/hid/hid-cando.c

+2 −0
Original line number Diff line number Diff line
@@ -235,6 +235,8 @@ static void cando_remove(struct hid_device *hdev) 
static const struct hid_device_id cando_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,

			USB_DEVICE_ID_CANDO_MULTI_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,

			USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,

			USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,

drivers/hid/hid-core.c

+6 −1
Original line number Diff line number Diff line
@@ -1312,7 +1312,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
@@ -1324,6 +1326,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_TRUETOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
@@ -1335,11 +1338,13 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
@@ -1422,6 +1427,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U) },
@@ -1640,7 +1646,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0004) },

drivers/hid/hid-ids.h

+7 −0
Original line number Diff line number Diff line
@@ -140,7 +140,9 @@ 
#define USB_DEVICE_ID_BTC_EMPREX_REMOTE_2	0x5577



#define USB_VENDOR_ID_CANDO		0x2087

#define USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH 0x0703

#define USB_DEVICE_ID_CANDO_MULTI_TOUCH	0x0a01

#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1 0x0a02

#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03

#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01
@@ -186,6 +188,7 @@ 
#define USB_DEVICE_ID_CYPRESS_BARCODE_1	0xde61

#define USB_DEVICE_ID_CYPRESS_BARCODE_2	0xde64

#define USB_DEVICE_ID_CYPRESS_BARCODE_3	0xbca1

#define USB_DEVICE_ID_CYPRESS_TRUETOUCH	0xc001



#define USB_VENDOR_ID_DEALEXTREAME	0x10c5

#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701	0x819a
@@ -236,6 +239,7 @@ 
#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR	0x0002



#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS 0x0001



#define USB_VENDOR_ID_GLAB		0x06c2

#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038
@@ -318,6 +322,9 @@ 
#define USB_DEVICE_ID_HANWANG_TABLET_FIRST	0x5000

#define USB_DEVICE_ID_HANWANG_TABLET_LAST	0x8fff



#define USB_VENDOR_ID_HANVON		0x20b3

#define USB_DEVICE_ID_HANVON_MULTITOUCH	0x0a18



#define USB_VENDOR_ID_HAPP		0x078b

#define USB_DEVICE_ID_UGCI_DRIVING	0x0010

#define USB_DEVICE_ID_UGCI_FLYING	0x0020

CRA Git | Maintained and supported by SUSTech CRA and CCSE