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

Commit 3b264d27 authored by Hans de Goede's avatar Hans de Goede Committed by Darren Hart
Browse files

Revert "ideapad-laptop: Disable touchpad interface on Yoga models" 



I've received a bug report from a user that the touchpad control part
of the ideapad-laptop ACPI interface does work for him on his
"Lenovo Yoga 2 13", and that this patch causes a regression for him.

Since it did not work for me when I had a "Lenovo Yoga 2 11" in my own
hands (loaned from a friend). It seems that this is a bit of hit and miss.

Since the result of having a false positive here is worse, then the minor
annoyance of a false touchpad disabled messages being shown after suspend /
resume on models (or is it firmware versions?) where the interface does not
work, simply revert the patch.

This reverts commit f79a9013.

Reported-by: default avatarGOESSEL Guillaume <g_goessel@outlook.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
parent e181ba15

drivers/platform/x86/ideapad-laptop.c

+0 −27
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ struct ideapad_private { 
	struct dentry *debug;

	unsigned long cfg;

	bool has_hw_rfkill_switch;

	bool has_touchpad_control;

};



static bool no_bt_rfkill;
@@ -767,9 +766,6 @@ static void ideapad_sync_touchpad_state(struct ideapad_private *priv) 
{

	unsigned long value;



	if (!priv->has_touchpad_control)

		return;



	/* Without reading from EC touchpad LED doesn't switch state */

	if (!read_ec_data(priv->adev->handle, VPCCMD_R_TOUCHPAD, &value)) {

		/* Some IdeaPads don't really turn off touchpad - they only
@@ -844,28 +840,6 @@ static struct dmi_system_id no_hw_rfkill_list[] = { 
	{}

};



/*

 * Some models don't offer touchpad ctrl through the ideapad interface, causing

 * ideapad_sync_touchpad_state to send wrong touchpad enable/disable events.

 */

static struct dmi_system_id no_touchpad_ctrl_list[] = {

	{

		.ident = "Lenovo Yoga 1 series",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Yoga"),

		},

	},

	{

		.ident = "Lenovo Yoga 2 11 / 13 / Pro",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),

		},

	},

	{}

};



static int ideapad_acpi_add(struct platform_device *pdev)

{

	int ret, i;
@@ -889,7 +863,6 @@ static int ideapad_acpi_add(struct platform_device *pdev) 
	priv->adev = adev;

	priv->platform_device = pdev;

	priv->has_hw_rfkill_switch = !dmi_check_system(no_hw_rfkill_list);

	priv->has_touchpad_control = !dmi_check_system(no_touchpad_ctrl_list);



	ret = ideapad_sysfs_init(priv);

	if (ret)