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

Commit 3716d346 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.71 into android-4.19-q 



Changes in 4.19.71
	Revert "Input: elantech - enable SMBus on new (2018+) systems"
	Linux 4.19.71

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I4a7427ca04e312145dd45493d371db71b80d70af
parents 544e5516 e7d2672c

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 70

SUBLEVEL = 71

EXTRAVERSION =

NAME = "People's Front"

drivers/input/mouse/elantech.c

+29 −25
Original line number Diff line number Diff line
@@ -1810,30 +1810,6 @@ static int elantech_create_smbus(struct psmouse *psmouse, 
				  leave_breadcrumbs);

}



static bool elantech_use_host_notify(struct psmouse *psmouse,

				     struct elantech_device_info *info)

{

	if (ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version))

		return true;



	switch (info->bus) {

	case ETP_BUS_PS2_ONLY:

		/* expected case */

		break;

	case ETP_BUS_SMB_HST_NTFY_ONLY:

	case ETP_BUS_PS2_SMB_HST_NTFY:

		/* SMbus implementation is stable since 2018 */

		if (dmi_get_bios_year() >= 2018)

			return true;

	default:

		psmouse_dbg(psmouse,

			    "Ignoring SMBus bus provider %d\n", info->bus);

		break;

	}



	return false;

}



/**

 * elantech_setup_smbus - called once the PS/2 devices are enumerated

 * and decides to instantiate a SMBus InterTouch device.
@@ -1853,7 +1829,7 @@ static int elantech_setup_smbus(struct psmouse *psmouse, 
		 * i2c_blacklist_pnp_ids.

		 * Old ICs are up to the user to decide.

		 */

		if (!elantech_use_host_notify(psmouse, info) ||

		if (!ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version) ||

		    psmouse_matches_pnp_id(psmouse, i2c_blacklist_pnp_ids))

			return -ENXIO;

	}
@@ -1873,6 +1849,34 @@ static int elantech_setup_smbus(struct psmouse *psmouse, 
	return 0;

}



static bool elantech_use_host_notify(struct psmouse *psmouse,

				     struct elantech_device_info *info)

{

	if (ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version))

		return true;



	switch (info->bus) {

	case ETP_BUS_PS2_ONLY:

		/* expected case */

		break;

	case ETP_BUS_SMB_ALERT_ONLY:

		/* fall-through  */

	case ETP_BUS_PS2_SMB_ALERT:

		psmouse_dbg(psmouse, "Ignoring SMBus provider through alert protocol.\n");

		break;

	case ETP_BUS_SMB_HST_NTFY_ONLY:

		/* fall-through  */

	case ETP_BUS_PS2_SMB_HST_NTFY:

		return true;

	default:

		psmouse_dbg(psmouse,

			    "Ignoring SMBus bus provider %d.\n",

			    info->bus);

	}



	return false;

}



int elantech_init_smbus(struct psmouse *psmouse)

{

	struct elantech_device_info info;