Commit f54405db authored by Alex Neblett's avatar Alex Neblett Committed by Jiri Kosina
Browse files

HID: add support for Pixart Imaging Optical Touch Screen 

Added support for the Pixart Imaging Inc. Optical Touch Screen found in the MSI
AE2220 and other new all in one computers to the Quanta Optical Touch
dual-touch panel driver found in the latest git clone
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

.

Signed-off-by: default avatarAlex Neblett <alexneblett01@yahoo.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent e1a0bdd8

drivers/hid/hid-core.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },

	{ 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) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ 


#define USB_VENDOR_ID_QUANTA		0x0408

#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH	0x3000

#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN	0x3001



#define USB_VENDOR_ID_SAMSUNG		0x0419

#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001

drivers/hid/hid-quanta.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,

			USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,

			USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },

	{ }

};

MODULE_DEVICE_TABLE(hid, quanta_devices);