mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
113 lines
5.1 KiB
Diff
113 lines
5.1 KiB
Diff
From 13e475d4826aa0be579632fd2a7473aee213e82b Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Tissoires <benjamin.tissoires@enac.fr>
|
|
Date: Wed, 23 Nov 2011 10:54:31 +0100
|
|
Subject: [PATCH 082/129] HID: multitouch: cleanup with eGalax PID definitions
|
|
|
|
commit e36f690b37945e0a9bb1554e1546eeec93f7d1f6 upstream.
|
|
|
|
This is just a renaming of USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH{N}
|
|
to USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_{PID} to handle more eGalax
|
|
devices.
|
|
|
|
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
|
|
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
drivers/hid/hid-core.c | 12 ++++++------
|
|
drivers/hid/hid-ids.h | 12 ++++++------
|
|
drivers/hid/hid-multitouch.c | 24 ++++++++++++------------
|
|
3 files changed, 24 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
|
|
index b51cbf2..4434aba 100644
|
|
--- a/drivers/hid/hid-core.c
|
|
+++ b/drivers/hid/hid-core.c
|
|
@@ -1404,12 +1404,12 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },
|
|
- { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
|
|
- { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
|
|
- { 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_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
|
|
{ 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) },
|
|
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
|
index 4c9a342..9db8789 100644
|
|
--- a/drivers/hid/hid-ids.h
|
|
+++ b/drivers/hid/hid-ids.h
|
|
@@ -230,12 +230,12 @@
|
|
|
|
#define USB_VENDOR_ID_DWAV 0x0eef
|
|
#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001
|
|
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d
|
|
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1 0x720c
|
|
-#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_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D 0x480d
|
|
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E 0x480e
|
|
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c
|
|
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B 0x726b
|
|
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1 0x72a1
|
|
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001
|
|
|
|
#define USB_VENDOR_ID_ELECOM 0x056e
|
|
#define USB_DEVICE_ID_ELECOM_BM084 0x0061
|
|
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
|
index a59d939..815bd22 100644
|
|
--- a/drivers/hid/hid-multitouch.c
|
|
+++ b/drivers/hid/hid-multitouch.c
|
|
@@ -645,26 +645,26 @@ static const struct hid_device_id mt_devices[] = {
|
|
USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
|
|
|
|
/* eGalax devices (resistive) */
|
|
- { .driver_data = MT_CLS_EGALAX,
|
|
+ { .driver_data = MT_CLS_EGALAX,
|
|
HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
|
|
- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
|
|
- { .driver_data = MT_CLS_EGALAX,
|
|
+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
|
|
+ { .driver_data = MT_CLS_EGALAX,
|
|
HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
|
|
- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
|
|
+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
|
|
|
|
/* eGalax devices (capacitive) */
|
|
- { .driver_data = MT_CLS_EGALAX,
|
|
+ { .driver_data = MT_CLS_EGALAX,
|
|
HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
|
|
- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
|
|
- { .driver_data = MT_CLS_EGALAX,
|
|
+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
|
|
+ { .driver_data = MT_CLS_EGALAX,
|
|
HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
|
|
- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
|
|
- { .driver_data = MT_CLS_EGALAX,
|
|
+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
|
|
+ { .driver_data = MT_CLS_EGALAX,
|
|
HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
|
|
- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
|
|
- { .driver_data = MT_CLS_EGALAX,
|
|
+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
|
|
+ { .driver_data = MT_CLS_EGALAX,
|
|
HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
|
|
- USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
|
|
+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
|
|
|
|
/* Elo TouchSystems IntelliTouch Plus panel */
|
|
{ .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
|
|
--
|
|
1.7.9.5
|
|
|