aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/trackpoint.h
diff options
context:
space:
mode:
authorAaron Ma <aaron.ma@canonical.com>2017-08-18 12:17:21 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-08-18 17:04:11 -0700
commitec667683c532c93fb41e100e5d61a518971060e2 (patch)
treefaa3f0b351f1fd183a0a434c2c12c3338229c61a /drivers/input/mouse/trackpoint.h
parentInput: elan_i2c - add ELAN0602 ACPI ID to support Lenovo Yoga310 (diff)
downloadlinux-dev-ec667683c532c93fb41e100e5d61a518971060e2.tar.xz
linux-dev-ec667683c532c93fb41e100e5d61a518971060e2.zip
Input: trackpoint - add new trackpoint firmware ID
Synaptics add new TP firmware ID: 0x2 and 0x3, for now both lower 2 bits are indicated as TP. Change the constant to bitwise values. This makes trackpoint to be recognized on Lenovo Carbon X1 Gen5 instead of it being identified as "PS/2 Generic Mouse". Signed-off-by: Aaron Ma <aaron.ma@canonical.com> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to '')
-rw-r--r--drivers/input/mouse/trackpoint.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
index 5617ed3a7d7a..88055755f82e 100644
--- a/drivers/input/mouse/trackpoint.h
+++ b/drivers/input/mouse/trackpoint.h
@@ -21,8 +21,9 @@
#define TP_COMMAND 0xE2 /* Commands start with this */
#define TP_READ_ID 0xE1 /* Sent for device identification */
-#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */
+#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */
/* by the firmware ID */
+ /* Firmware ID includes 0x1, 0x2, 0x3 */
/*