diff mbox series

HID: multitouch: add quirks to enable Lenovo X12 trackpoint

Message ID CO6PR03MB6241CB276FCDC7F4CEDC34F6E1E29@CO6PR03MB6241.namprd03.prod.outlook.com (mailing list archive)
State Mainlined
Commit 95cd2cdc88c755dcd0a58b951faeb77742c733a4
Delegated to: Jiri Kosina
Headers show
Series HID: multitouch: add quirks to enable Lenovo X12 trackpoint | expand

Commit Message

Tao J April 3, 2022, 4:57 p.m. UTC
This applies the similar quirks used by previous generation devices
such as X1 tablet for X12 tablet, so that the trackpoint and buttons
can work.

This patch was applied and tested working on 5.17.1 . 

Signed-off-by: Tao Jin <tao-j@outlook.com>
---
 drivers/hid/hid-ids.h        | 1 +
 drivers/hid/hid-multitouch.c | 6 ++++++
 2 files changed, 7 insertions(+)

Comments

Benjamin Tissoires April 4, 2022, 10:09 a.m. UTC | #1
Hi,

On Sun, Apr 3, 2022 at 6:58 PM Tao Jin <tao-j@outlook.com> wrote:
>
> This applies the similar quirks used by previous generation devices
> such as X1 tablet for X12 tablet, so that the trackpoint and buttons
> can work.
>
> This patch was applied and tested working on 5.17.1 .
>
> Signed-off-by: Tao Jin <tao-j@outlook.com>

Thanks a lot for the patch.

I have added the CC: stable@vger.kernel.org tag and pushed the patch
to for-5.18/upstream-fixes

Cheers,
Benjamin

> ---
>  drivers/hid/hid-ids.h        | 1 +
>  drivers/hid/hid-multitouch.c | 6 ++++++
>  2 files changed, 7 insertions(+)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 78bd3dd..aca7909 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -760,6 +760,7 @@
>  #define USB_DEVICE_ID_LENOVO_X1_COVER  0x6085
>  #define USB_DEVICE_ID_LENOVO_X1_TAB    0x60a3
>  #define USB_DEVICE_ID_LENOVO_X1_TAB3   0x60b5
> +#define USB_DEVICE_ID_LENOVO_X12_TAB   0x60fe
>  #define USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E    0x600e
>  #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D     0x608d
>  #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019     0x6019
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 99eabfb..0dece60 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -2034,6 +2034,12 @@ static const struct hid_device_id mt_devices[] = {
>                            USB_VENDOR_ID_LENOVO,
>                            USB_DEVICE_ID_LENOVO_X1_TAB3) },
>
> +       /* Lenovo X12 TAB Gen 1 */
> +       { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,
> +               HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
> +                          USB_VENDOR_ID_LENOVO,
> +                          USB_DEVICE_ID_LENOVO_X12_TAB) },
> +
>         /* MosArt panels */
>         { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
>                 MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
> --
> 2.35.1
>
diff mbox series

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 78bd3dd..aca7909 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -760,6 +760,7 @@ 
 #define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085
 #define USB_DEVICE_ID_LENOVO_X1_TAB	0x60a3
 #define USB_DEVICE_ID_LENOVO_X1_TAB3	0x60b5
+#define USB_DEVICE_ID_LENOVO_X12_TAB	0x60fe
 #define USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E	0x600e
 #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d
 #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019	0x6019
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 99eabfb..0dece60 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -2034,6 +2034,12 @@  static const struct hid_device_id mt_devices[] = {
 			   USB_VENDOR_ID_LENOVO,
 			   USB_DEVICE_ID_LENOVO_X1_TAB3) },
 
+	/* Lenovo X12 TAB Gen 1 */
+	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,
+		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
+			   USB_VENDOR_ID_LENOVO,
+			   USB_DEVICE_ID_LENOVO_X12_TAB) },
+
 	/* MosArt panels */
 	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
 		MT_USB_DEVICE(USB_VENDOR_ID_ASUS,