[SRU] [B/C/D/OEM-B/OEM-OSP1-B] [PATCH 0/2] Add pointstick support on HP ZBook 17 G5

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[SRU] [B/C/D/OEM-B/OEM-OSP1-B] [PATCH 0/2] Add pointstick support on HP ZBook 17 G5

Kai-Heng Feng
BugLink: https://bugs.launchpad.net/bugs/1833387

[Impact]
Pointstick on HP ZBook 17 G5 doesn't work.

[Fix]
Let hid-multitouch know it has a pointstick, and exposes it as a mouse.

[Test]
With the fix applied the pointstick starts to work.

[Regression Potential]
Low. It's limited to one driver and limited to one specific device.

Kai-Heng Feng (2):
  Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A"
  HID: multitouch: Add pointstick support for ALPS Touchpad

 drivers/hid/hid-ids.h        | 2 +-
 drivers/hid/hid-multitouch.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[B/C/D/OEM-B/OEM-OSP1-B] [PATCH 1/2] Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A"

Kai-Heng Feng
BugLink: https://bugs.launchpad.net/bugs/1833387

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 <[hidden email]>
Acked-by: Benjamin Tissoires <[hidden email]>
Signed-off-by: Jiri Kosina <[hidden email]>
(cherry picked from commit 66dcdafe8e251a3edc5d84cf725835567bd3dd35)
Signed-off-by: Kai-Heng Feng <[hidden email]>
---
 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 6a8cb0679961..ea2f630189f3 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
 #define HID_DEVICE_ID_ALPS_U1 0x1215
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 8aa76eb5d531..24fa3febb461 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1477,10 +1477,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.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[B/C/D/OEM-B/OEM-OSP1-B] [PATCH 2/2] UBUNTU: SAUCE: HID: multitouch: Add pointstick support for ALPS Touchpad

Kai-Heng Feng
In reply to this post by Kai-Heng Feng
BugLink: https://bugs.launchpad.net/bugs/1833387

Patchwork: https://patchwork.kernel.org/patch/10994741/

There's a new ALPS touchpad/pointstick combo device that requires
MT_CLS_WIN_8_DUAL to make its pointsitck work as a mouse.

The device can be found on HP ZBook 17 G5.

Signed-off-by: Kai-Heng Feng <[hidden email]>
---
 drivers/hid/hid-ids.h        | 1 +
 drivers/hid/hid-multitouch.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index ea2f630189f3..9c523e0cbac5 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -79,6 +79,7 @@
 #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220
 #define HID_DEVICE_ID_ALPS_U1 0x1215
 #define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C
+#define HID_DEVICE_ID_ALPS_1222 0x1222
 
 
 #define USB_VENDOR_ID_AMI 0x046b
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 24fa3febb461..15687b45b33c 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1477,6 +1477,10 @@ 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_1222) },
 
  /* Lenovo X1 TAB Gen 2 */
  { .driver_data = MT_CLS_WIN_8_DUAL,
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK/APPLIED [OEM-OSP1-B] Re: [SRU] [B/C/D/OEM-B/OEM-OSP1-B] [PATCH 0/2] Add pointstick support on HP ZBook 17 G5

Timo Aaltonen-6
In reply to this post by Kai-Heng Feng
On 19.6.2019 10.51, Kai-Heng Feng wrote:

> BugLink: https://bugs.launchpad.net/bugs/1833387
>
> [Impact]
> Pointstick on HP ZBook 17 G5 doesn't work.
>
> [Fix]
> Let hid-multitouch know it has a pointstick, and exposes it as a mouse.
>
> [Test]
> With the fix applied the pointstick starts to work.
>
> [Regression Potential]
> Low. It's limited to one driver and limited to one specific device.
>
> Kai-Heng Feng (2):
>   Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A"
>   HID: multitouch: Add pointstick support for ALPS Touchpad
>
>  drivers/hid/hid-ids.h        | 2 +-
>  drivers/hid/hid-multitouch.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>

applied to osp1 oem-next, thanks

--
t

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK/APPLIED[OEM-B]: [SRU] [B/C/D/OEM-B/OEM-OSP1-B] [PATCH 0/2] Add pointstick support on HP ZBook 17 G5

AceLan Kao
In reply to this post by Kai-Heng Feng
Applied on Ubuntu-oem-4.15.0-1044.49

Acked-By: AceLan Kao <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED(B,C,D): [SRU] [B/C/D/OEM-B/OEM-OSP1-B] [PATCH 0/2] Add pointstick support on HP ZBook 17 G5

Khaled Elmously
In reply to this post by Kai-Heng Feng
On 2019-06-19 15:51:05 , Kai-Heng Feng wrote:

> BugLink: https://bugs.launchpad.net/bugs/1833387
>
> [Impact]
> Pointstick on HP ZBook 17 G5 doesn't work.
>
> [Fix]
> Let hid-multitouch know it has a pointstick, and exposes it as a mouse.
>
> [Test]
> With the fix applied the pointstick starts to work.
>
> [Regression Potential]
> Low. It's limited to one driver and limited to one specific device.
>
> Kai-Heng Feng (2):
>   Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A"
>   HID: multitouch: Add pointstick support for ALPS Touchpad
>
>  drivers/hid/hid-ids.h        | 2 +-
>  drivers/hid/hid-multitouch.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> --
> 2.17.1
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED[Unstable]/cmt: [SRU] [B/C/D/OEM-B/OEM-OSP1-B] [PATCH 0/2] Add pointstick support on HP ZBook 17 G5

Seth Forshee
In reply to this post by Kai-Heng Feng
On Wed, Jun 19, 2019 at 03:51:05PM +0800, Kai-Heng Feng wrote:

> BugLink: https://bugs.launchpad.net/bugs/1833387
>
> [Impact]
> Pointstick on HP ZBook 17 G5 doesn't work.
>
> [Fix]
> Let hid-multitouch know it has a pointstick, and exposes it as a mouse.
>
> [Test]
> With the fix applied the pointstick starts to work.
>
> [Regression Potential]
> Low. It's limited to one driver and limited to one specific device.

Please don't forget to also include unstable when needed!

Applied to unstable/master, thanks!

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team