Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec667683 authored by Aaron Ma's avatar Aaron Ma Committed by Dmitry Torokhov
Browse files

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: default avatarAaron Ma <aaron.ma@canonical.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 1d2226e4

drivers/input/mouse/trackpoint.c

+2 −1
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir 
	if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))

		return -1;



	if (param[0] != TP_MAGIC_IDENT)

	/* add new TP ID. */

	if (!(param[0] & TP_MAGIC_IDENT))

		return -1;



	if (firmware_id)

drivers/input/mouse/trackpoint.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */





/*