aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2018-07-11 06:38:36 -0400
committerJiri Kosina <jkosina@suse.cz>2018-07-17 09:25:40 -0400
commit6e5dd6324a4ce3438b4e8ae35e1a0fdd096a0418 (patch)
tree36d054119debd1c003ae2c050949a1d12648a730
parent7ed3f281d8f36c19ca15fe7fcc52200668a73d72 (diff)
HID: elan: Add USB-id for HP x2 10-n000nd touchpad
Now that we query all the parameters, adding support for new hardware is easy. This commit adds support for the touchpad found on the HP x2 10-n000nd touchpad 2-in-1. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-elan.c2
-rw-r--r--drivers/hid/hid-ids.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-elan.c b/drivers/hid/hid-elan.c
index ae1e24061c0a..4b050d395ecc 100644
--- a/drivers/hid/hid-elan.c
+++ b/drivers/hid/hid-elan.c
@@ -470,6 +470,8 @@ static void elan_remove(struct hid_device *hdev)
470} 470}
471 471
472static const struct hid_device_id elan_devices[] = { 472static const struct hid_device_id elan_devices[] = {
473 { HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_HP_X2),
474 .driver_data = ELAN_HAS_LED },
473 { HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_HP_X2_10_COVER), 475 { HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_HP_X2_10_COVER),
474 .driver_data = ELAN_HAS_LED }, 476 .driver_data = ELAN_HAS_LED },
475 { } 477 { }
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index c7981ddd8776..28f96de2a84e 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -369,6 +369,7 @@
369#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001 369#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001
370 370
371#define USB_VENDOR_ID_ELAN 0x04f3 371#define USB_VENDOR_ID_ELAN 0x04f3
372#define USB_DEVICE_ID_HP_X2 0x074d
372#define USB_DEVICE_ID_HP_X2_10_COVER 0x0755 373#define USB_DEVICE_ID_HP_X2_10_COVER 0x0755
373 374
374#define USB_VENDOR_ID_ELECOM 0x056e 375#define USB_VENDOR_ID_ELECOM 0x056e