Commit bab97524 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:

 - a tweak to the IBM Trackpoint driver that helps recognizing
   trackpoints on never Lenovo Carbons

 - a fix to the ALPS driver solving scroll issues on some Dells

 - yet another ACPI ID has been added to Elan I2C toucpad driver

 - quieted diagnostic message in soc_button_array driver

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ALPS - fix two-finger scroll breakage in right side on ALPS touchpad
  Input: soc_button_array - silence -ENOENT error on Dell XPS13 9365
  Input: trackpoint - add new trackpoint firmware ID
  Input: elan_i2c - add ELAN0602 ACPI ID to support Lenovo Yoga310
parents 9716bdb2 4a646580

drivers/input/misc/soc_button_array.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static int soc_button_probe(struct platform_device *pdev) 
	error = gpiod_count(dev, NULL);

	if (error < 0) {

		dev_dbg(dev, "no GPIO attached, ignoring...\n");

		return error;

		return -ENODEV;

	}



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

drivers/input/mouse/alps.c

+31 −10
Original line number Diff line number Diff line
@@ -1215,14 +1215,24 @@ static int alps_decode_ss4_v2(struct alps_fields *f, 


	case SS4_PACKET_ID_TWO:

		if (priv->flags & ALPS_BUTTONPAD) {

			if (IS_SS4PLUS_DEV(priv->dev_id)) {

				f->mt[0].x = SS4_PLUS_BTL_MF_X_V2(p, 0);

				f->mt[1].x = SS4_PLUS_BTL_MF_X_V2(p, 1);

			} else {

				f->mt[0].x = SS4_BTL_MF_X_V2(p, 0);

			f->mt[0].y = SS4_BTL_MF_Y_V2(p, 0);

				f->mt[1].x = SS4_BTL_MF_X_V2(p, 1);

			}

			f->mt[0].y = SS4_BTL_MF_Y_V2(p, 0);

			f->mt[1].y = SS4_BTL_MF_Y_V2(p, 1);

		} else {

			if (IS_SS4PLUS_DEV(priv->dev_id)) {

				f->mt[0].x = SS4_PLUS_STD_MF_X_V2(p, 0);

				f->mt[1].x = SS4_PLUS_STD_MF_X_V2(p, 1);

			} else {

				f->mt[0].x = SS4_STD_MF_X_V2(p, 0);

			f->mt[0].y = SS4_STD_MF_Y_V2(p, 0);

				f->mt[1].x = SS4_STD_MF_X_V2(p, 1);

			}

			f->mt[0].y = SS4_STD_MF_Y_V2(p, 0);

			f->mt[1].y = SS4_STD_MF_Y_V2(p, 1);

		}

		f->pressure = SS4_MF_Z_V2(p, 0) ? 0x30 : 0;
@@ -1239,16 +1249,27 @@ static int alps_decode_ss4_v2(struct alps_fields *f, 


	case SS4_PACKET_ID_MULTI:

		if (priv->flags & ALPS_BUTTONPAD) {

			if (IS_SS4PLUS_DEV(priv->dev_id)) {

				f->mt[0].x = SS4_PLUS_BTL_MF_X_V2(p, 0);

				f->mt[1].x = SS4_PLUS_BTL_MF_X_V2(p, 1);

			} else {

				f->mt[2].x = SS4_BTL_MF_X_V2(p, 0);

			f->mt[2].y = SS4_BTL_MF_Y_V2(p, 0);

				f->mt[3].x = SS4_BTL_MF_X_V2(p, 1);

			}



			f->mt[2].y = SS4_BTL_MF_Y_V2(p, 0);

			f->mt[3].y = SS4_BTL_MF_Y_V2(p, 1);

			no_data_x = SS4_MFPACKET_NO_AX_BL;

			no_data_y = SS4_MFPACKET_NO_AY_BL;

		} else {

			f->mt[2].x = SS4_STD_MF_X_V2(p, 0);

			if (IS_SS4PLUS_DEV(priv->dev_id)) {

				f->mt[0].x = SS4_PLUS_STD_MF_X_V2(p, 0);

				f->mt[1].x = SS4_PLUS_STD_MF_X_V2(p, 1);

			} else {

				f->mt[0].x = SS4_STD_MF_X_V2(p, 0);

				f->mt[1].x = SS4_STD_MF_X_V2(p, 1);

			}

			f->mt[2].y = SS4_STD_MF_Y_V2(p, 0);

			f->mt[3].x = SS4_STD_MF_X_V2(p, 1);

			f->mt[3].y = SS4_STD_MF_Y_V2(p, 1);

			no_data_x = SS4_MFPACKET_NO_AX;

			no_data_y = SS4_MFPACKET_NO_AY;
@@ -2541,8 +2562,8 @@ static int alps_set_defaults_ss4_v2(struct psmouse *psmouse, 


	memset(otp, 0, sizeof(otp));



	if (alps_get_otp_values_ss4_v2(psmouse, 0, &otp[0][0]) ||

	    alps_get_otp_values_ss4_v2(psmouse, 1, &otp[1][0]))

	if (alps_get_otp_values_ss4_v2(psmouse, 1, &otp[1][0]) ||

	    alps_get_otp_values_ss4_v2(psmouse, 0, &otp[0][0]))

		return -1;



	alps_update_device_area_ss4_v2(otp, priv);

drivers/input/mouse/alps.h

+8 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ enum SS4_PACKET_ID { 
				 ((_b[1 + _i * 3]  << 5) & 0x1F00)	\

				)



#define SS4_PLUS_STD_MF_X_V2(_b, _i) (((_b[0 + (_i) * 3] << 4) & 0x0070) | \

				 ((_b[1 + (_i) * 3]  << 4) & 0x0F80)	\

				)



#define SS4_STD_MF_Y_V2(_b, _i)	(((_b[1 + (_i) * 3] << 3) & 0x0010) |	\

				 ((_b[2 + (_i) * 3] << 5) & 0x01E0) |	\

				 ((_b[2 + (_i) * 3] << 4) & 0x0E00)	\
@@ -109,6 +113,10 @@ enum SS4_PACKET_ID { 
				 ((_b[0 + (_i) * 3] >> 3) & 0x0010)	\

				)



#define SS4_PLUS_BTL_MF_X_V2(_b, _i) (SS4_PLUS_STD_MF_X_V2(_b, _i) |	\

				 ((_b[0 + (_i) * 3] >> 4) & 0x0008)	\

				)



#define SS4_BTL_MF_Y_V2(_b, _i)	(SS4_STD_MF_Y_V2(_b, _i) | \

				 ((_b[0 + (_i) * 3] >> 3) & 0x0008)	\

				)

drivers/input/mouse/elan_i2c_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1247,6 +1247,7 @@ static const struct acpi_device_id elan_acpi_id[] = { 
	{ "ELAN0000", 0 },

	{ "ELAN0100", 0 },

	{ "ELAN0600", 0 },

	{ "ELAN0602", 0 },

	{ "ELAN0605", 0 },

	{ "ELAN0608", 0 },

	{ "ELAN0605", 0 },

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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE