platform/x86: ideapad-laptop: Disable touchpad_switch

[ Upstream commit a231224a601c1924b9df620281ad04472900d75f ]

Ideapads for "Lenovo Yoga 3 Pro 1370" and "ZhaoYang K4e-IML" do not
use EC to switch touchpad.

Reading VPCCMD_R_TOUCHPAD will return zero thus touchpad may be blocked
unexpectedly.

Signed-off-by: Manyi Li <limanyi@uniontech.com>
Link: https://lore.kernel.org/r/20221018095323.14591-1-limanyi@uniontech.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index e7a1299e3776668cce588c2595aa34ac9c9f0fc9..ab4dfff2174bb9e92661c0b83e70923f2a03fcfd 100644 (file)
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -1499,6 +1499,24 @@ static const struct dmi_system_id hw_rfkill_list[] = {
        {}
 };
 
+static const struct dmi_system_id no_touchpad_switch_list[] = {
+       {
+       .ident = "Lenovo Yoga 3 Pro 1370",
+       .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+               DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3"),
+               },
+       },
+       {
+       .ident = "ZhaoYang K4e-IML",
+       .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+               DMI_MATCH(DMI_PRODUCT_VERSION, "ZhaoYang K4e-IML"),
+               },
+       },
+       {}
+};
+
 static void ideapad_check_features(struct ideapad_private *priv)
 {
        acpi_handle handle = priv->adev->handle;
@@ -1507,7 +1525,12 @@ static void ideapad_check_features(struct ideapad_private *priv)
        priv->features.hw_rfkill_switch = dmi_check_system(hw_rfkill_list);
 
        /* Most ideapads with ELAN0634 touchpad don't use EC touchpad switch */
-       priv->features.touchpad_ctrl_via_ec = !acpi_dev_present("ELAN0634", NULL, -1);
+       if (acpi_dev_present("ELAN0634", NULL, -1))
+               priv->features.touchpad_ctrl_via_ec = 0;
+       else if (dmi_check_system(no_touchpad_switch_list))
+               priv->features.touchpad_ctrl_via_ec = 0;
+       else
+               priv->features.touchpad_ctrl_via_ec = 1;
 
        if (!read_ec_data(handle, VPCCMD_R_FAN, &val))
                priv->features.fan_mode = true;