diff options
author | Austin Hendrix <ahendrix@willowgarage.com> | 2012-06-04 18:27:51 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-06-06 10:00:39 -0400 |
commit | 4db703ead4535792ea54dba7275fdd1527848e74 (patch) | |
tree | 3d95648bb8c2e5dee09e7234b4498cb1fadc1a9e /drivers | |
parent | 3c2c4b73aa79e4a1b601710b59e092441175f4bb (diff) |
HID: multitouch: add support for Novatek touchscreen
Add support for a Novatek touchscreen panel as a generic HID multitouch
panel.
Signed-off-by: Austin Hendrix <ahendrix@willowgarage.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/hid/hid-multitouch.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 9373f535dfe9..734a2b986502 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -564,6 +564,9 @@ | |||
564 | #define USB_VENDOR_ID_NINTENDO 0x057e | 564 | #define USB_VENDOR_ID_NINTENDO 0x057e |
565 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306 | 565 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306 |
566 | 566 | ||
567 | #define USB_VENDOR_ID_NOVATEK 0x0603 | ||
568 | #define USB_DEVICE_ID_NOVATEK_PCT 0x0600 | ||
569 | |||
567 | #define USB_VENDOR_ID_NTRIG 0x1b96 | 570 | #define USB_VENDOR_ID_NTRIG 0x1b96 |
568 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001 | 571 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001 |
569 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1 0x0003 | 572 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1 0x0003 |
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 6e3332a99976..fae08dfd18bf 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -951,6 +951,11 @@ static const struct hid_device_id mt_devices[] = { | |||
951 | MT_USB_DEVICE(USB_VENDOR_ID_PANASONIC, | 951 | MT_USB_DEVICE(USB_VENDOR_ID_PANASONIC, |
952 | USB_DEVICE_ID_PANABOARD_UBT880) }, | 952 | USB_DEVICE_ID_PANABOARD_UBT880) }, |
953 | 953 | ||
954 | /* Novatek Panel */ | ||
955 | { .driver_data = MT_CLS_DEFAULT, | ||
956 | HID_USB_DEVICE(USB_VENDOR_ID_NOVATEK, | ||
957 | USB_DEVICE_ID_NOVATEK_PCT) }, | ||
958 | |||
954 | /* PenMount panels */ | 959 | /* PenMount panels */ |
955 | { .driver_data = MT_CLS_CONFIDENCE, | 960 | { .driver_data = MT_CLS_CONFIDENCE, |
956 | MT_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, | 961 | MT_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, |