| From 1fd8f047490dd0ec4e4db710fcbc1bd4798d944c Mon Sep 17 00:00:00 2001 |
| From: Chris Bagwell <chris@cnpbagwell.com> |
| Date: Wed, 23 Nov 2011 10:54:27 +0100 |
| Subject: HID: hid-multitouch - add another eGalax id |
| |
| From: Chris Bagwell <chris@cnpbagwell.com> |
| |
| commit 1fd8f047490dd0ec4e4db710fcbc1bd4798d944c upstream. |
| |
| This allows ASUS Eee Slate touchscreens to work. |
| |
| Signed-off-by: Chris Bagwell <chris@cnpbagwell.com> |
| Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/hid/hid-core.c | 1 + |
| drivers/hid/hid-ids.h | 1 + |
| drivers/hid/hid-multitouch.c | 3 +++ |
| 3 files changed, 5 insertions(+) |
| |
| --- a/drivers/hid/hid-core.c |
| +++ b/drivers/hid/hid-core.c |
| @@ -1409,6 +1409,7 @@ static const struct hid_device_id hid_ha |
| { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) }, |
| { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) }, |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -235,6 +235,7 @@ |
| #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1 |
| #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e |
| #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b |
| +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0xa001 |
| |
| #define USB_VENDOR_ID_ELECOM 0x056e |
| #define USB_DEVICE_ID_ELECOM_BM084 0x0061 |
| --- a/drivers/hid/hid-multitouch.c |
| +++ b/drivers/hid/hid-multitouch.c |
| @@ -662,6 +662,9 @@ static const struct hid_device_id mt_dev |
| { .driver_data = MT_CLS_EGALAX, |
| HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
| USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, |
| + { .driver_data = MT_CLS_EGALAX, |
| + HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
| + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) }, |
| |
| /* Elo TouchSystems IntelliTouch Plus panel */ |
| { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID, |
