summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0082-HID-multitouch-cleanup-with-eGalax-PID-definitions.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0082-HID-multitouch-cleanup-with-eGalax-PID-definitions.patch')
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0082-HID-multitouch-cleanup-with-eGalax-PID-definitions.patch112
1 files changed, 112 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0082-HID-multitouch-cleanup-with-eGalax-PID-definitions.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0082-HID-multitouch-cleanup-with-eGalax-PID-definitions.patch
new file mode 100644
index 00000000..db1d435e
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0082-HID-multitouch-cleanup-with-eGalax-PID-definitions.patch
@@ -0,0 +1,112 @@
1From e5664bb7172d41e38788a503d6e33d14af866fb5 Mon Sep 17 00:00:00 2001
2From: Benjamin Tissoires <benjamin.tissoires@enac.fr>
3Date: Wed, 23 Nov 2011 10:54:31 +0100
4Subject: [PATCH 082/130] HID: multitouch: cleanup with eGalax PID definitions
5
6commit e36f690b37945e0a9bb1554e1546eeec93f7d1f6 upstream.
7
8This is just a renaming of USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH{N}
9to USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_{PID} to handle more eGalax
10devices.
11
12Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
13Signed-off-by: Jiri Kosina <jkosina@suse.cz>
14Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
15---
16 drivers/hid/hid-core.c | 12 ++++++------
17 drivers/hid/hid-ids.h | 12 ++++++------
18 drivers/hid/hid-multitouch.c | 24 ++++++++++++------------
19 3 files changed, 24 insertions(+), 24 deletions(-)
20
21diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
22index b51cbf2..4434aba 100644
23--- a/drivers/hid/hid-core.c
24+++ b/drivers/hid/hid-core.c
25@@ -1404,12 +1404,12 @@ static const struct hid_device_id hid_have_special_driver[] = {
26 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
27 { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
28 { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },
29- { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
30- { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
31- { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
32- { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
33- { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
34- { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
35+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
36+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
37+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
38+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
39+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
40+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
41 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
42 { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
43 { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
44diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
45index 4c9a342..9db8789 100644
46--- a/drivers/hid/hid-ids.h
47+++ b/drivers/hid/hid-ids.h
48@@ -230,12 +230,12 @@
49
50 #define USB_VENDOR_ID_DWAV 0x0eef
51 #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001
52-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d
53-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1 0x720c
54-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1
55-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e
56-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b
57-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0xa001
58+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D 0x480d
59+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E 0x480e
60+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c
61+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B 0x726b
62+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1 0x72a1
63+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001
64
65 #define USB_VENDOR_ID_ELECOM 0x056e
66 #define USB_DEVICE_ID_ELECOM_BM084 0x0061
67diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
68index a59d939..815bd22 100644
69--- a/drivers/hid/hid-multitouch.c
70+++ b/drivers/hid/hid-multitouch.c
71@@ -645,26 +645,26 @@ static const struct hid_device_id mt_devices[] = {
72 USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
73
74 /* eGalax devices (resistive) */
75- { .driver_data = MT_CLS_EGALAX,
76+ { .driver_data = MT_CLS_EGALAX,
77 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
78- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
79- { .driver_data = MT_CLS_EGALAX,
80+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
81+ { .driver_data = MT_CLS_EGALAX,
82 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
83- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
84+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
85
86 /* eGalax devices (capacitive) */
87- { .driver_data = MT_CLS_EGALAX,
88+ { .driver_data = MT_CLS_EGALAX,
89 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
90- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
91- { .driver_data = MT_CLS_EGALAX,
92+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
93+ { .driver_data = MT_CLS_EGALAX,
94 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
95- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
96- { .driver_data = MT_CLS_EGALAX,
97+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
98+ { .driver_data = MT_CLS_EGALAX,
99 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
100- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
101- { .driver_data = MT_CLS_EGALAX,
102+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
103+ { .driver_data = MT_CLS_EGALAX,
104 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
105- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
106+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
107
108 /* Elo TouchSystems IntelliTouch Plus panel */
109 { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
110--
1111.7.7.4
112
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-20 01:32:48 +0000