diff options
author | Chris Bagwell <chris@cnpbagwell.com> | 2011-11-23 04:54:27 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-23 08:50:37 -0500 |
commit | 1fd8f047490dd0ec4e4db710fcbc1bd4798d944c (patch) | |
tree | abf322f6bace693f9828681373e143a1d62716fd | |
parent | 30307c69d59b14723fbf8a524847b302388c702d (diff) |
HID: hid-multitouch - add another eGalax id
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>
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-multitouch.c | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 848a56c0279c..f973d330464f 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1409,6 +1409,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1409 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, | 1409 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, |
1410 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, | 1410 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, |
1411 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, | 1411 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, |
1412 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) }, | ||
1412 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, | 1413 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, |
1413 | { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) }, | 1414 | { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) }, |
1414 | { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) }, | 1415 | { 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 06ce996b8b65..7bb52275bed4 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -235,6 +235,7 @@ | |||
235 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1 | 235 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1 |
236 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e | 236 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e |
237 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b | 237 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b |
238 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0xa001 | ||
238 | 239 | ||
239 | #define USB_VENDOR_ID_ELECOM 0x056e | 240 | #define USB_VENDOR_ID_ELECOM 0x056e |
240 | #define USB_DEVICE_ID_ELECOM_BM084 0x0061 | 241 | #define USB_DEVICE_ID_ELECOM_BM084 0x0061 |
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index f1c909f1b239..a59d939dd165 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -662,6 +662,9 @@ static const struct hid_device_id mt_devices[] = { | |||
662 | { .driver_data = MT_CLS_EGALAX, | 662 | { .driver_data = MT_CLS_EGALAX, |
663 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | 663 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
664 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, | 664 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, |
665 | { .driver_data = MT_CLS_EGALAX, | ||
666 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | ||
667 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) }, | ||
665 | 668 | ||
666 | /* Elo TouchSystems IntelliTouch Plus panel */ | 669 | /* Elo TouchSystems IntelliTouch Plus panel */ |
667 | { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID, | 670 | { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID, |