diff options
| -rw-r--r-- | drivers/hid/hid-alps.c | 3 | ||||
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c index 5ae2cba8fe76..b1eeb4839bfc 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c | |||
| @@ -767,6 +767,7 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
| 767 | data->dev_type = T4; | 767 | data->dev_type = T4; |
| 768 | break; | 768 | break; |
| 769 | case HID_DEVICE_ID_ALPS_U1_DUAL: | 769 | case HID_DEVICE_ID_ALPS_U1_DUAL: |
| 770 | case HID_DEVICE_ID_ALPS_U1: | ||
| 770 | data->dev_type = U1; | 771 | data->dev_type = U1; |
| 771 | break; | 772 | break; |
| 772 | default: | 773 | default: |
| @@ -791,6 +792,8 @@ static const struct hid_device_id alps_id[] = { | |||
| 791 | { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, | 792 | { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, |
| 792 | USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) }, | 793 | USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) }, |
| 793 | { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, | 794 | { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, |
| 795 | USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) }, | ||
| 796 | { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, | ||
| 794 | USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) }, | 797 | USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) }, |
| 795 | { } | 798 | { } |
| 796 | }; | 799 | }; |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 7410a7bf4461..f1435374006e 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -1890,6 +1890,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 1890 | #if IS_ENABLED(CONFIG_HID_ALPS) | 1890 | #if IS_ENABLED(CONFIG_HID_ALPS) |
| 1891 | { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) }, | 1891 | { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) }, |
| 1892 | { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) }, | 1892 | { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) }, |
| 1893 | { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) }, | ||
| 1893 | { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) }, | 1894 | { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) }, |
| 1894 | #endif | 1895 | #endif |
| 1895 | #if IS_ENABLED(CONFIG_HID_APPLE) | 1896 | #if IS_ENABLED(CONFIG_HID_APPLE) |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index edc9f2ae2810..f265c3362f67 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -77,6 +77,7 @@ | |||
| 77 | #define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B | 77 | #define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B |
| 78 | #define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F | 78 | #define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F |
| 79 | #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220 | 79 | #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220 |
| 80 | #define HID_DEVICE_ID_ALPS_U1 0x1215 | ||
| 80 | #define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C | 81 | #define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C |
| 81 | 82 | ||
| 82 | 83 | ||
