From: Masaki Ota <012nexus@gmail.com>
To: jikos@kernel.org, benjamin.tissoires@redhat.com
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
masaki.ota@jp.alps.com
Subject: [PATCH 2/2] Add new U1 device ID
Date: Thu, 30 Mar 2017 11:53:17 +0900 [thread overview]
Message-ID: <20170330025317.4093-3-masaki.ota@jp.alps.com> (raw)
In-Reply-To: <20170330025317.4093-1-masaki.ota@jp.alps.com>
-Add new Alps U1 Touchpad device ID
-Laptop names that use this Touchpad:HP Elitebook x360 1030 G2
Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>
---
drivers/hid/hid-alps.c | 3 +++
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 1 +
3 files changed, 5 insertions(+)
diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index 13a6db1..f19a7f4 100644
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c
@@ -758,6 +758,7 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)
data->dev_type = T4;
break;
case HID_DEVICE_ID_ALPS_U1_DUAL:
+ case HID_DEVICE_ID_ALPS_U1:
data->dev_type = U1;
break;
default:
@@ -782,6 +783,8 @@ static const struct hid_device_id alps_id[] = {
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
+ USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) },
+ { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) },
{ }
};
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index f315192..0f88944 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1770,6 +1770,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) },
{ HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
+ { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) },
{ HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 9239543..e0bad95 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -75,6 +75,7 @@
#define USB_VENDOR_ID_ALPS_JP 0x044E
#define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B
+#define HID_DEVICE_ID_ALPS_U1 0x1215
#define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C
#define USB_VENDOR_ID_AMI 0x046b
--
2.9.3
next prev parent reply other threads:[~2017-03-30 2:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 2:53 [PATCH 0/2] Support new Alps HID I2C Touchpad device Masaki Ota
2017-03-30 2:53 ` [PATCH 1/2] Alps HID I2C T4 device support Masaki Ota
2017-04-04 3:08 ` Nikolaus Rath
2017-04-04 6:55 ` Masaki Ota
2017-04-04 17:08 ` Nikolaus Rath
2017-04-04 17:08 ` Nikolaus Rath
2017-04-04 23:40 ` Masaki Ota
2017-04-04 23:42 ` Nikolaus Rath
2017-04-04 23:42 ` Nikolaus Rath
2017-04-04 23:49 ` Masaki Ota
2017-04-05 0:01 ` Nikolaus Rath
2017-04-05 0:01 ` Nikolaus Rath
2017-04-05 8:43 ` Masaki Ota
2017-04-05 18:35 ` Nikolaus Rath
2017-04-05 18:35 ` Nikolaus Rath
2017-04-06 1:07 ` Masaki Ota
2017-04-06 22:59 ` Nikolaus Rath
2017-04-06 22:59 ` Nikolaus Rath
2017-04-24 14:54 ` Benjamin Tissoires
2017-03-30 2:53 ` Masaki Ota [this message]
2017-04-03 12:15 [PATCH v2 0/6] hpet: fix build warnings and style Corentin Labbe
2017-04-03 12:15 ` [PATCH v2 1/6] hpet: remove unused variable hpet in hpet_ioctl_common Corentin Labbe
2017-04-03 12:15 ` [PATCH v2 2/6] hpet: remove unused writeq/readq function definitions Corentin Labbe
2017-04-03 12:15 ` [PATCH v2 3/6] hpet: fix checkpatch complains about spaces Corentin Labbe
2017-04-03 12:15 ` [PATCH v2 4/6] hpet: replace printk by their pr_xxx counterparts Corentin Labbe
2017-04-03 19:44 ` Joe Perches
2017-04-03 12:15 ` [PATCH v2 5/6] hpet: removing unused variable m in hpet_interrupt Corentin Labbe
2017-04-03 12:55 ` Clemens Ladisch
2017-04-03 12:15 ` [PATCH v2 6/6] hpet: fix style issue about braces and alignment Corentin Labbe
2017-04-04 3:43 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170330025317.4093-3-masaki.ota@jp.alps.com \
--to=012nexus@gmail.com \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masaki.ota@jp.alps.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.