diff mbox series

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

Message ID 20171011064635.5876-2-kai.heng.feng@canonical.com
State New
Headers show
Series HID: multitouch: Correct ALPS PTP Stick and Touchpad devices ID | expand

Commit Message

Kai-Heng Feng Oct. 11, 2017, 6:46 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1722719

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>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit 66dcdafe8e251a3edc5d84cf725835567bd3dd35)
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

Stefan Bader Oct. 11, 2017, 12:25 p.m. UTC | #1 
On 11.10.2017 08:46, Kai-Heng Feng wrote:
> BugLink: https://bugs.launchpad.net/bugs/1722719
> 
> This reverts commit fcaa4a07d2a4b541e91da7a55d8b3331f96d1865.
> 
> As noted by Masaki [1], 0x120A + trackpoint will not be used in mass
> production machines, so remove the ID accordingly.

You are sure? Because we just have been adding this as a SAUCE patch to Xenial
for https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1712481

-Stefan
> 
> [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>
> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
> (cherry picked from commit 66dcdafe8e251a3edc5d84cf725835567bd3dd35)
> 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 b2e0d50ba168..04ea7e90e8b8 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -69,7 +69,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 1b9cdc0d01f0..f501b06844fc 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -1227,10 +1227,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) },
>  
>  	/* Anton devices */
>  	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
>
Shrirang Bagul Oct. 12, 2017, 3:24 a.m. UTC | #2 
On Wed, 2017-10-11 at 14:25 +0200, Stefan Bader wrote:
> On 11.10.2017 08:46, Kai-Heng Feng wrote:
> > BugLink: https://bugs.launchpad.net/bugs/1722719
> > 
> > This reverts commit fcaa4a07d2a4b541e91da7a55d8b3331f96d1865.
> > 
> > As noted by Masaki [1], 0x120A + trackpoint will not be used in mass
> > production machines, so remove the ID accordingly.
> 
> You are sure? Because we just have been adding this as a SAUCE patch to Xenial
> for https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1712481
Yes, we added the SAUCE patch to support this device. However, ALPS decided to pull
devices with this VID/PID from production. So, we no longer need this change anymore.

-Shrirang
> 
> -Stefan
> > 
> > [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>
> > Signed-off-by: Jiri Kosina <jkosina@suse.cz>
> > (cherry picked from commit 66dcdafe8e251a3edc5d84cf725835567bd3dd35)
> > 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 b2e0d50ba168..04ea7e90e8b8 100644
> > --- a/drivers/hid/hid-ids.h
> > +++ b/drivers/hid/hid-ids.h
> > @@ -69,7 +69,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 1b9cdc0d01f0..f501b06844fc 100644
> > --- a/drivers/hid/hid-multitouch.c
> > +++ b/drivers/hid/hid-multitouch.c
> > @@ -1227,10 +1227,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) },
> >  
> >  	/* Anton devices */
> >  	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
> > 
> 
>
Kleber Sacilotto de Souza Oct. 30, 2017, 1:54 p.m. UTC | #3 
Applied to xenial/master-next branch. Thanks.
diff mbox series

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b2e0d50ba168..04ea7e90e8b8 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -69,7 +69,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 1b9cdc0d01f0..f501b06844fc 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1227,10 +1227,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) },
 
 	/* Anton devices */
 	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,