diff mbox

[1/1] Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A"

Message ID 20171002075034.21586-1-kai.heng.feng@canonical.com
State New, archived
Headers show

Commit Message

Kai-Heng Feng Oct. 2, 2017, 7:50 a.m. UTC
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(-)

Comments

Benjamin Tissoires Oct. 2, 2017, 8:03 a.m. UTC | #1
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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jiri Kosina Oct. 2, 2017, 9:49 a.m. UTC | #2
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.
diff mbox

Patch

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,