Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1743002 > unrolled thread
| Started by | Kai-Heng Feng <kai.heng.feng@canonical.com> |
|---|---|
| First post | 2017-10-02 10:00 +0200 |
| Last post | 2017-10-02 12:00 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH 1/1] Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A" Kai-Heng Feng <kai.heng.feng@canonical.com> - 2017-10-02 10:00 +0200
Re: [PATCH 1/1] Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A" Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2017-10-02 10:10 +0200
Re: [PATCH 1/1] Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A" Jiri Kosina <jikos@kernel.org> - 2017-10-02 12:00 +0200
| From | Kai-Heng Feng <kai.heng.feng@canonical.com> |
|---|---|
| Date | 2017-10-02 10:00 +0200 |
| Subject | [PATCH 1/1] Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A" |
| Message-ID | <uw3NW-4As-17@gated-at.bofh.it> |
This reverts commit fcaa4a07d2a4b541e91da7a55d8b3331f96d1865.
As noted by Masaki [1], 0x120A + trackpoint will not be used in mass
production machines, so remove the ID accordingly.
[1] http://www.spinics.net/lists/linux-input/msg53222.html
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
drivers/hid/hid-ids.h | 1 -
drivers/hid/hid-multitouch.c | 4 ----
2 files changed, 5 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 832897d4a849..a98919199858 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -75,7 +75,6 @@
#define USB_VENDOR_ID_ALPS_JP 0x044E
#define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B
-#define HID_DEVICE_ID_ALPS_U1_PTP_2 0x120A
#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F
#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index c78625dceced..9e8c4d2ba11d 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1419,10 +1419,6 @@ static const struct hid_device_id mt_devices[] = {
HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
USB_VENDOR_ID_ALPS_JP,
HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },
- { .driver_data = MT_CLS_WIN_8_DUAL,
- HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
- USB_VENDOR_ID_ALPS_JP,
- HID_DEVICE_ID_ALPS_U1_PTP_2) },
/* Lenovo X1 TAB Gen 2 */
{ .driver_data = MT_CLS_WIN_8_DUAL,
--
2.14.2
[toc] | [next] | [standalone]
| From | Benjamin Tissoires <benjamin.tissoires@redhat.com> |
|---|---|
| Date | 2017-10-02 10:10 +0200 |
| Subject | Re: [PATCH 1/1] Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A" |
| Message-ID | <uw3Xz-4SD-1@gated-at.bofh.it> |
| In reply to | #1743002 |
On Oct 02 2017 or thereabouts, Kai-Heng Feng wrote:
> This reverts commit fcaa4a07d2a4b541e91da7a55d8b3331f96d1865.
>
> As noted by Masaki [1], 0x120A + trackpoint will not be used in mass
> production machines, so remove the ID accordingly.
>
> [1] http://www.spinics.net/lists/linux-input/msg53222.html
>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cheers,
Benjamin
> ---
> drivers/hid/hid-ids.h | 1 -
> drivers/hid/hid-multitouch.c | 4 ----
> 2 files changed, 5 deletions(-)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 832897d4a849..a98919199858 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -75,7 +75,6 @@
>
> #define USB_VENDOR_ID_ALPS_JP 0x044E
> #define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B
> -#define HID_DEVICE_ID_ALPS_U1_PTP_2 0x120A
> #define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F
> #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220
>
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index c78625dceced..9e8c4d2ba11d 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -1419,10 +1419,6 @@ static const struct hid_device_id mt_devices[] = {
> HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
> USB_VENDOR_ID_ALPS_JP,
> HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },
> - { .driver_data = MT_CLS_WIN_8_DUAL,
> - HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
> - USB_VENDOR_ID_ALPS_JP,
> - HID_DEVICE_ID_ALPS_U1_PTP_2) },
>
> /* Lenovo X1 TAB Gen 2 */
> { .driver_data = MT_CLS_WIN_8_DUAL,
> --
> 2.14.2
>
[toc] | [prev] | [next] | [standalone]
| From | Jiri Kosina <jikos@kernel.org> |
|---|---|
| Date | 2017-10-02 12:00 +0200 |
| Subject | Re: [PATCH 1/1] Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A" |
| Message-ID | <uw5G1-5HV-7@gated-at.bofh.it> |
| In reply to | #1743002 |
On Mon, 2 Oct 2017, Kai-Heng Feng wrote: > This reverts commit fcaa4a07d2a4b541e91da7a55d8b3331f96d1865. > > As noted by Masaki [1], 0x120A + trackpoint will not be used in mass > production machines, so remove the ID accordingly. > > [1] http://www.spinics.net/lists/linux-input/msg53222.html > > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Applied to for-4.14/upstream-fixes. -- Jiri Kosina SUSE Labs
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web