[PATCH 0/1] Input/trackpoint: Add new ELAN trackpoint device variant id 7

[PATCH 0/1] Input/trackpoint: Add new ELAN trackpoint device variant id 7

[Yuan Yao]

The new ELAN trackpoint variant id 7 is found on thinkpad
X14 Gen1 laptop(Product Name: 21XMA006CD), it's now
incorrectly probed as Generic or Logitech PS/2 mouse but not
trackpoint.

Add ELAN variant id 7 to match the TP_READ_ID command return
value, probe the device as trackpoint correctly.

I tested the sensitivity/middle button lock/rate/resolution
setting, the trackpoint works well in daily usage and when
resume form system sleeping, no issue is found in my last
weeks usage.


BEFORE:
input: PS/2 Generic Mouse as /devices/platform/i8042/serio1/input/input63

AFTER:
psmouse serio1: trackpoint: Elan_variant7 TrackPoint firmware: 0xa1, buttons: 3/3
input: TPPS/2 Elan_variant7 TrackPoint as /devices/platform/i8042/serio1/input/input65

The patch is rebased to 7.4-rc1.

Yuan Yao (1):
  Input: trackpoint - Add new ELAN trackpoint device variant id 7

 drivers/input/mouse/trackpoint.c | 2 ++
 drivers/input/mouse/trackpoint.h | 1 +
 2 files changed, 3 insertions(+)


base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
--
2.56.0

[PATCH 1/1] Input: trackpoint - Add new ELAN trackpoint device variant id 7

[Yuan Yao]

The new ELAN trackpoint variant id 7 is found on thinkpad
X14 Gen1 laptop(Product Name: 21XMA006CD), it's now
incorrectly probed as Generic or Logitech PS/2 mouse.

Add ELAN variant id 7 to match the TP_READ_ID command
return value, probe the device as trackpoint correctly.

BEFORE:
input: PS/2 Generic Mouse as /devices/platform/i8042/serio1/input/input63

AFTER:
psmouse serio1: trackpoint: Elan_variant7 TrackPoint firmware: 0xa1, buttons: 3/3
input: TPPS/2 Elan_variant7 TrackPoint as /devices/platform/i8042/serio1/input/input65

Signed-off-by: Yuan Yao <yaoyuan0329os@gmail.com>
---
 drivers/input/mouse/trackpoint.c | 2 ++
 drivers/input/mouse/trackpoint.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index 3bd8fdf56cd3..f46fc1665c96 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -25,6 +25,7 @@ static const char * const trackpoint_variants[] = {
 	[TP_VARIANT_NXP]		= "NXP",
 	[TP_VARIANT_JYT_SYNAPTICS]	= "JYT_Synaptics",
 	[TP_VARIANT_SYNAPTICS]		= "Synaptics",
+	[TP_VARIANT_ELAN_ID_7]		= "Elan_variant7"
 };
 
 /*
@@ -283,6 +284,7 @@ static int trackpoint_start_protocol(struct psmouse *psmouse,
 	case TP_VARIANT_IBM:
 	case TP_VARIANT_ALPS:
 	case TP_VARIANT_ELAN:
+	case TP_VARIANT_ELAN_ID_7:
 	case TP_VARIANT_NXP:
 	case TP_VARIANT_JYT_SYNAPTICS:
 	case TP_VARIANT_SYNAPTICS:
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
index 3e03cdb39449..b67fc228cf3e 100644
--- a/drivers/input/mouse/trackpoint.h
+++ b/drivers/input/mouse/trackpoint.h
@@ -30,6 +30,7 @@
 #define TP_VARIANT_NXP			0x04
 #define TP_VARIANT_JYT_SYNAPTICS	0x05
 #define TP_VARIANT_SYNAPTICS		0x06
+#define TP_VARIANT_ELAN_ID_7		0x07
 
 /*
  * Commands
-- 
2.56.0