On Mon, Jun 06, 2016 at 12:25:24PM -0400, João Paulo Rechi Vita wrote:
> Don't try to control the touchpad on laptops that do not support it, as
> it leads to sending wrong KEY_TOUCHPAD_ON / KEY_TOUCHPAD_OFF events to
> userspace.
Other than some minor comment clarity/grammar, this looks like a reasonable
approach to get the new models working without risking breakage to the older
models. I'll correct.
Maxim, Ike? OK with this approach?
>
> Signed-off-by: João Paulo Rechi Vita <jprvita@xxxxxxxxxxxx>
> ---
> drivers/platform/x86/ideapad-laptop.c | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
> index 06a837a..6270948 100644
> --- a/drivers/platform/x86/ideapad-laptop.c
> +++ b/drivers/platform/x86/ideapad-laptop.c
> @@ -93,6 +93,7 @@ struct ideapad_private {
> struct dentry *debug;
> unsigned long cfg;
> bool has_hw_rfkill_switch;
> + bool has_tp_ctrl;
> };
>
> static bool no_bt_rfkill;
> @@ -773,6 +774,9 @@ static void ideapad_sync_touchpad_state(struct ideapad_private *priv)
> {
> unsigned long value;
>
> + if (!priv->has_tp_ctrl)
> + 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
> @@ -930,6 +934,27 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
> {}
> };
>
> +/*
> + * Avoid sending wrong KEY_TOUCHPAD_ON / KEY_TOUCHPAD_OFF events to userspace.
> + */
> +static const struct dmi_system_id no_tp_ctrl_list[] = {
> + {
> + .ident = "Lenovo 80HE", /* Yoga 3 Pro 2 */
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "80HE"),
> + },
> + },
> + {
> + .ident = "Lenovo 80MK", /* Yoga 900 */
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "80MK"),
> + },
> + },
> + {}
> +};
> +
> static int ideapad_acpi_add(struct platform_device *pdev)
> {
> int ret, i;
> @@ -953,6 +978,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_tp_ctrl = !dmi_check_system(no_tp_ctrl_list);
>
> ret = ideapad_sysfs_init(priv);
> if (ret)
> --
> 2.5.0
>
>
--
Darren Hart
Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
