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

Commit c7a1aefc 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:

 - mark "guest" RMI device as pass-through port to avoid "phantom" ALPS
   toouchpad on newer Lenovo Carbons

 - add two more laptops to the Elantech's lists of devices using CRC
   mode

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics-rmi4 - register F03 port as pass-through serio
  Input: elantech - add Fujitsu Lifebook E546/E557 to force crc_enabled
parents 2833b7e9 a0897d5f

drivers/input/mouse/elantech.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -1118,8 +1118,10 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse, 
 * 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 E544   0x470f00        d0, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E546   0x470f00        50, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E547   0x470f00        50, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E547   0x470f00        50, 12, 09      2 hw buttons

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

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

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

 * Fujitsu T725            0x470f01        05, 12, 09      2 hw buttons

 * Fujitsu T725            0x470f01        05, 12, 09      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
@@ -1524,6 +1526,13 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E544"),

			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E544"),

		},

		},

	},

	},

	{

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

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),

			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E546"),

		},

	},

	{

	{

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

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

		.matches = {

		.matches = {
@@ -1545,6 +1554,13 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E556"),

			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E556"),

		},

		},

	},

	},

	{

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

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),

			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E557"),

		},

	},

	{

	{

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

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

		.matches = {

		.matches = {

drivers/input/rmi4/rmi_f03.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -146,7 +146,7 @@ static int rmi_f03_register_pt(struct f03_data *f03) 
	if (!serio)

	if (!serio)

		return -ENOMEM;

		return -ENOMEM;





	serio->id.type = SERIO_8042;

	serio->id.type = SERIO_PS_PSTHRU;

	serio->write = rmi_f03_pt_write;

	serio->write = rmi_f03_pt_write;

	serio->port_data = f03;

	serio->port_data = f03;