Commit 94011f93 authored by Rafi Rubin's avatar Rafi Rubin Committed by Jiri Kosina
Browse files

HID: add n-trig digitizer support 



Added quirks for the N-Trig digitizer.

Signed-off-by: default avatarRafi Rubin <rafi@seas.upenn.edu>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 9188e79e

drivers/hid/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -187,6 +187,13 @@ config HID_MONTEREY 
	---help---

	Support for Monterey Genius KB29E.



config HID_NTRIG

	tristate "NTrig" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for N-Trig touch screen.



config HID_PANTHERLORD

	tristate "Pantherlord devices support" if EMBEDDED

	depends on USB_HID

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ obj-$(CONFIG_HID_GYRATION) += hid-gyration.o 
obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o

obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

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

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

obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o

obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o

obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1292,6 +1292,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

drivers/hid/hid-dummy.c

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ static int __init hid_dummy_init(void) 
#ifdef CONFIG_HID_MONTEREY_MODULE

	HID_COMPAT_CALL_DRIVER(monterey);

#endif

#ifdef CONFIG_HID_NTRIG_MODULE

	HID_COMPAT_CALL_DRIVER(ntrig);

#endif

#ifdef CONFIG_HID_PANTHERLORD_MODULE

	HID_COMPAT_CALL_DRIVER(pantherlord);

#endif

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -328,6 +328,9 @@ 
#define USB_VENDOR_ID_NEC		0x073e

#define USB_DEVICE_ID_NEC_USB_GAME_PAD	0x0301



#define USB_VENDOR_ID_NTRIG                0x1b96

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN   0x0001



#define USB_VENDOR_ID_ONTRAK		0x0a07

#define USB_DEVICE_ID_ONTRAK_ADU100	0x0064