[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.2 / 0081-HID-hid-multitouch-add-another-eGalax-id.patch
1 From 15efaf9be89966a57b4d147511de686976e4a4eb Mon Sep 17 00:00:00 2001
2 From: Chris Bagwell <chris@cnpbagwell.com>
3 Date: Wed, 23 Nov 2011 10:54:27 +0100
4 Subject: [PATCH 081/129] HID: hid-multitouch - add another eGalax id
6 commit 1fd8f047490dd0ec4e4db710fcbc1bd4798d944c upstream.
8 This allows ASUS Eee Slate touchscreens to work.
10 Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
11 Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
12 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 ---
15 drivers/hid/hid-core.c | 1 +
16 drivers/hid/hid-ids.h | 1 +
17 drivers/hid/hid-multitouch.c | 3 +++
18 3 files changed, 5 insertions(+)
20 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
21 index 1473067..b51cbf2 100644
22 --- a/drivers/hid/hid-core.c
23 +++ b/drivers/hid/hid-core.c
24 @@ -1409,6 +1409,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
25 { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
26 { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
27 { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
28 + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
29 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
30 { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
31 { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
32 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
33 index 4a441a6..4c9a342 100644
34 --- a/drivers/hid/hid-ids.h
35 +++ b/drivers/hid/hid-ids.h
36 @@ -235,6 +235,7 @@
37 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1
38 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e
39 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b
40 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0xa001
42 #define USB_VENDOR_ID_ELECOM 0x056e
43 #define USB_DEVICE_ID_ELECOM_BM084 0x0061
44 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
45 index f1c909f..a59d939 100644
46 --- a/drivers/hid/hid-multitouch.c
47 +++ b/drivers/hid/hid-multitouch.c
48 @@ -662,6 +662,9 @@ static const struct hid_device_id mt_devices[] = {
49 { .driver_data = MT_CLS_EGALAX,
50 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
51 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
52 + { .driver_data = MT_CLS_EGALAX,
53 + HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
54 + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
56 /* Elo TouchSystems IntelliTouch Plus panel */
57 { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
58 --
59 1.7.9.5