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

Commit 3441456b 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 layer updates from Dmitry Torokhov:
 "Just a few quirks for PS/2 this time"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elantech - add more Fujtisu notebooks to force crc_enabled
  Input: i8042 - add noloop quirk for Medion Akoya E7225 (MD98857)
  Input: synaptics - adjust min/max for Lenovo ThinkPad X1 Carbon 2nd
parents 00845eb9 47c1ffb2

drivers/input/mouse/elantech.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -1097,6 +1097,8 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse, 
 * Asus UX31               0x361f00        20, 15, 0e      clickpad

 * Asus UX31               0x361f00        20, 15, 0e      clickpad

 * Asus UX32VD             0x361f02        00, 15, 0e      clickpad

 * Asus UX32VD             0x361f02        00, 15, 0e      clickpad

 * Avatar AVIU-145A2       0x361f00        ?               clickpad

 * Avatar AVIU-145A2       0x361f00        ?               clickpad

 * Fujitsu LIFEBOOK E544   0x470f00        d0, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E554   0x570f01        40, 14, 0c      2 hw buttons

 * Fujitsu H730            0x570f00        c0, 14, 0c      3 hw buttons (**)

 * Fujitsu H730            0x570f00        c0, 14, 0c      3 hw buttons (**)

 * Gigabyte U2442          0x450f01        58, 17, 0c      2 hw buttons

 * Gigabyte U2442          0x450f01        58, 17, 0c      2 hw buttons

 * Lenovo L430             0x350f02        b9, 15, 0c      2 hw buttons (*)

 * Lenovo L430             0x350f02        b9, 15, 0c      2 hw buttons (*)
@@ -1475,6 +1477,20 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H730"),

			DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H730"),

		},

		},

	},

	},

	{

		/* Fujitsu LIFEBOOK E554  does not work with crc_enabled == 0 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),

			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E554"),

		},

	},

	{

		/* Fujitsu LIFEBOOK E544  does not work with crc_enabled == 0 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),

			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E544"),

		},

	},

#endif

#endif

	{ }

	{ }

};

};

drivers/input/mouse/synaptics.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -135,8 +135,9 @@ static const struct min_max_quirk min_max_pnpid_table[] = { 
		1232, 5710, 1156, 4696

		1232, 5710, 1156, 4696

	},

	},

	{

	{

		(const char * const []){"LEN0034", "LEN0036", "LEN0039",

		(const char * const []){"LEN0034", "LEN0036", "LEN0037",

					"LEN2002", "LEN2004", NULL},

					"LEN0039", "LEN2002", "LEN2004",

					NULL},

		1024, 5112, 2024, 4832

		1024, 5112, 2024, 4832

	},

	},

	{

	{
@@ -165,7 +166,7 @@ static const char * const topbuttonpad_pnp_ids[] = { 
	"LEN0034", /* T431s, L440, L540, T540, W540, X1 Carbon 2nd */

	"LEN0034", /* T431s, L440, L540, T540, W540, X1 Carbon 2nd */

	"LEN0035", /* X240 */

	"LEN0035", /* X240 */

	"LEN0036", /* T440 */

	"LEN0036", /* T440 */

	"LEN0037",

	"LEN0037", /* X1 Carbon 2nd */

	"LEN0038",

	"LEN0038",

	"LEN0039", /* T440s */

	"LEN0039", /* T440s */

	"LEN0041",

	"LEN0041",

drivers/input/serio/i8042-x86ia64io.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -151,6 +151,14 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { 
			DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),

		},

		},

	},

	},

	{

		/* Medion Akoya E7225 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Medion"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Akoya E7225"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"),

		},

	},

	{

	{

		/* Blue FB5601 */

		/* Blue FB5601 */

		.matches = {

		.matches = {