From 024e6188568bd25f95a9461eb53e134b6e3ea629 Mon Sep 17 00:00:00 2001 From: Spud2233 Date: Mon, 10 Nov 2014 20:26:48 +1100 Subject: [PATCH 1/2] Update hid-multitouch.c Add support for Chalkboard Electronics touch screens. --- drivers/hid/hid-multitouch.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index bb276fda116670..408108d14c456e 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1074,7 +1074,13 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_DEFAULT, HID_USB_DEVICE(USB_VENDOR_ID_FOCALTECH, USB_DEVICE_ID_FOCALTECH_TOUCH) }, + + /* Chalkboard Electronics 7" and 10" */ + { .driver_data = MT_CLS_DEFAULT, HID_USB_DEVICE(0x04D8,0xF724) }, + /* Chalkboard Electronics 14" */ + { .driver_data = MT_CLS_DEFAULT, HID_USB_DEVICE(0x0EEF,0xA107) }, + /* Elitegroup Computer Systems */ { .driver_data = MT_CLS_DEFAULT, HID_USB_DEVICE(USB_VENDOR_ID_ELITEGROUP, From 19c6a28840a06921e35ca0399d5921950dc8bfc7 Mon Sep 17 00:00:00 2001 From: Spud2233 Date: Mon, 10 Nov 2014 22:13:41 +1100 Subject: [PATCH 2/2] Update hid-multitouch.c --- drivers/hid/hid-multitouch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 408108d14c456e..92ea2dd538f2fd 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1075,11 +1075,11 @@ static const struct hid_device_id mt_devices[] = { HID_USB_DEVICE(USB_VENDOR_ID_FOCALTECH, USB_DEVICE_ID_FOCALTECH_TOUCH) }, - /* Chalkboard Electronics 7" and 10" */ - { .driver_data = MT_CLS_DEFAULT, HID_USB_DEVICE(0x04D8,0xF724) }, + /* Chalkboard Electronics 7" and 10" */ + { .driver_data = MT_CLS_DEFAULT, HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP,USB_DEVICE_ID_CHALK_ELEC_7_10) }, /* Chalkboard Electronics 14" */ - { .driver_data = MT_CLS_DEFAULT, HID_USB_DEVICE(0x0EEF,0xA107) }, + { .driver_data = MT_CLS_DEFAULT, HID_USB_DEVICE(USB_VENDOR_ID_DWAV,USB_DEVICE_ID_CHALK_ELEC_14) }, /* Elitegroup Computer Systems */ { .driver_data = MT_CLS_DEFAULT,