From: "Eray Orçunus" <erayorcunus@gmail.com>
To: platform-driver-x86@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
ike.pan@canonical.com, jikos@kernel.org,
benjamin.tissoires@redhat.com, dmitry.torokhov@gmail.com,
hdegoede@redhat.com, mgross@linux.intel.com,
pobrn@protonmail.com, "Eray Orçunus" <erayorcunus@gmail.com>
Subject: [PATCH v2 1/7] Revert "platform/x86: ideapad-laptop: check for touchpad support in _CFG"
Date: Sat, 29 Oct 2022 15:03:06 +0300 [thread overview]
Message-ID: <20221029120311.11152-2-erayorcunus@gmail.com> (raw)
In-Reply-To: <20221029120311.11152-1-erayorcunus@gmail.com>
Last 8 bit of _CFG started being used in later IdeaPads, thus 30th bit
doesn't always show whether device supports touchpad or touchpad switch.
Remove checking bit 30 of _CFG, so older IdeaPads like S10-3 can switch
touchpad again via touchpad attribute.
This reverts commit b3ed1b7fe3786c8fe795c16ca07cf3bda67b652f.
Signed-off-by: Eray Orçunus <erayorcunus@gmail.com>
---
drivers/platform/x86/ideapad-laptop.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index e7a1299e3776..b67bac457a7a 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -46,11 +46,10 @@ static const char *const ideapad_wmi_fnesc_events[] = {
#endif
enum {
- CFG_CAP_BT_BIT = 16,
- CFG_CAP_3G_BIT = 17,
- CFG_CAP_WIFI_BIT = 18,
- CFG_CAP_CAM_BIT = 19,
- CFG_CAP_TOUCHPAD_BIT = 30,
+ CFG_CAP_BT_BIT = 16,
+ CFG_CAP_3G_BIT = 17,
+ CFG_CAP_WIFI_BIT = 18,
+ CFG_CAP_CAM_BIT = 19,
};
enum {
@@ -367,8 +366,6 @@ static int debugfs_cfg_show(struct seq_file *s, void *data)
seq_puts(s, " wifi");
if (test_bit(CFG_CAP_CAM_BIT, &priv->cfg))
seq_puts(s, " camera");
- if (test_bit(CFG_CAP_TOUCHPAD_BIT, &priv->cfg))
- seq_puts(s, " touchpad");
seq_puts(s, "\n");
seq_puts(s, "Graphics: ");
@@ -661,8 +658,7 @@ static umode_t ideapad_is_visible(struct kobject *kobj,
else if (attr == &dev_attr_fn_lock.attr)
supported = priv->features.fn_lock;
else if (attr == &dev_attr_touchpad.attr)
- supported = priv->features.touchpad_ctrl_via_ec &&
- test_bit(CFG_CAP_TOUCHPAD_BIT, &priv->cfg);
+ supported = priv->features.touchpad_ctrl_via_ec;
else if (attr == &dev_attr_usb_charging.attr)
supported = priv->features.usb_charging;
--
2.34.1
next prev parent reply other threads:[~2022-10-29 12:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-29 12:03 [PATCH v2 0/7] Add camera access keys, IdeaPad driver improvements Eray Orçunus
2022-10-29 12:03 ` Eray Orçunus [this message]
2022-11-15 20:25 ` [PATCH v2 1/7] Revert "platform/x86: ideapad-laptop: check for touchpad support in _CFG" Hans de Goede
2022-10-29 12:03 ` [PATCH v2 2/7] HID: add mapping for camera access keys Eray Orçunus
2022-11-04 8:36 ` Jiri Kosina
2022-11-15 20:33 ` Hans de Goede
2022-11-23 1:56 ` Dmitry Torokhov
2023-06-27 17:35 ` Dmitry Torokhov
2022-10-29 12:03 ` [PATCH v2 3/7] platform/x86: ideapad-laptop: Report KEY_CAMERA_ACCESS_TOGGLE instead of KEY_CAMERA Eray Orçunus
2022-11-15 20:31 ` Hans de Goede
2022-10-29 12:03 ` [PATCH v2 4/7] platform/x86: ideapad-laptop: Add new _CFG bit numbers for future use Eray Orçunus
2022-11-15 20:36 ` Hans de Goede
2022-10-29 12:03 ` [PATCH v2 5/7] platform/x86: ideapad-laptop: Expose camera_power only if supported Eray Orçunus
2022-11-15 20:43 ` Hans de Goede
2022-11-16 15:39 ` Hans de Goede
2022-10-29 12:03 ` [PATCH v2 6/7] platform/x86: ideapad-laptop: Keyboard backlight support for more IdeaPads Eray Orçunus
2022-11-15 20:59 ` Hans de Goede
2022-10-29 12:03 ` [PATCH v2 7/7] platform/x86: ideapad-laptop: Don't expose touchpad attr on IdeaPads with SYNA2B33 Eray Orçunus
2022-11-15 21:00 ` Hans de Goede
2022-11-08 3:56 ` [PATCH v2 0/7] Add camera access keys, IdeaPad driver improvements Ike Panhc
2022-11-09 12:58 ` Eray Orçunus
2022-11-09 16:38 ` Hans de Goede
2022-11-09 23:30 ` Eray Orçunus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221029120311.11152-2-erayorcunus@gmail.com \
--to=erayorcunus@gmail.com \
--cc=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=ike.pan@canonical.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mgross@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=pobrn@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).