Commit 24e73e90 authored by He Lugang's avatar He Lugang Committed by Wen Zhiwei
Browse files

HID: multitouch: Add support for lenovo Y9000P Touchpad 

stable inclusion
from stable-v6.6.57
commit c1846e0238999f7a84e0ab056b56a299b902ee48
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB2M97

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c1846e0238999f7a84e0ab056b56a299b902ee48



--------------------------------

commit 251efae73bd46b097deec4f9986d926813aed744 upstream.

The 2024 Lenovo Y9000P which use GT7868Q chip also needs a fixup.
The information of the chip is as follows:
I2C HID v1.00 Mouse [GXTP5100:00 27C6:01E0]

Signed-off-by: default avatarHe Lugang <helugang@uniontech.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
Signed-off-by: default avatarWangYuli <wangyuli@uniontech.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 59b40fb0

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -521,6 +521,7 @@ 
#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100



#define I2C_VENDOR_ID_GOODIX		0x27c6

#define I2C_DEVICE_ID_GOODIX_01E0	0x01e0

#define I2C_DEVICE_ID_GOODIX_01E8	0x01e8

#define I2C_DEVICE_ID_GOODIX_01E9	0x01e9

#define I2C_DEVICE_ID_GOODIX_01F0	0x01f0

drivers/hid/hid-multitouch.c

+6 −2
Original line number Diff line number Diff line
@@ -1447,7 +1447,8 @@ static __u8 *mt_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
{

	if (hdev->vendor == I2C_VENDOR_ID_GOODIX &&

	    (hdev->product == I2C_DEVICE_ID_GOODIX_01E8 ||

	     hdev->product == I2C_DEVICE_ID_GOODIX_01E9)) {

	     hdev->product == I2C_DEVICE_ID_GOODIX_01E9 ||

		 hdev->product == I2C_DEVICE_ID_GOODIX_01E0)) {

		if (rdesc[607] == 0x15) {

			rdesc[607] = 0x25;

			dev_info(
@@ -2068,7 +2069,10 @@ static const struct hid_device_id mt_devices[] = { 
		     I2C_DEVICE_ID_GOODIX_01E8) },

	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,

	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,

		     I2C_DEVICE_ID_GOODIX_01E8) },

		     I2C_DEVICE_ID_GOODIX_01E9) },

	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,

	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,

		     I2C_DEVICE_ID_GOODIX_01E0) },



	/* GoodTouch panels */

	{ .driver_data = MT_CLS_NSMU,