Skip to content

Commit

Permalink
ideapad-laptop: Disable touchpad interface on Yoga models
Browse files Browse the repository at this point in the history
Yoga models don't offer touchpad ctrl through the ideapad interface, causing
ideapad_sync_touchpad_state to send wrong touchpad enable/disable events.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  • Loading branch information
Hans de Goede authored and Matthew Garrett committed Aug 16, 2014
1 parent 6d6ded3 commit f79a901
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions drivers/platform/x86/ideapad-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ struct ideapad_private {
struct dentry *debug;
unsigned long cfg;
bool has_hw_rfkill_switch;
bool has_touchpad_control;
};

static bool no_bt_rfkill;
Expand Down Expand Up @@ -766,6 +767,9 @@ 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
Expand Down Expand Up @@ -840,6 +844,28 @@ 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;
Expand All @@ -863,6 +889,7 @@ 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)
Expand Down

0 comments on commit f79a901

Please sign in to comment.