From: Aaron Ma <aaron.ma@canonical.com>
To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org, Cheiny@synaptics.com,
aduggan@synaptics.com, benjamin.tissoires@redhat.com,
aaron.ma@canonical.com
Subject: [PATCH 2/2] Input: synaptics-rmi4 - export nosleep of f01 via sysfs
Date: Wed, 20 Feb 2019 17:42:00 +0100 [thread overview]
Message-ID: <20190220164200.31044-2-aaron.ma@canonical.com> (raw)
In-Reply-To: <20190220164200.31044-1-aaron.ma@canonical.com>
Some of ThinkPad X1C6 touchpads didn't wakeup after resume.
Forcing enable nosleep make touchpad back.
Add nosleep via sysfs, so user can control it to workaround issue.
/sys/devices/rmi4-00/nosleep can be written non-zero will enable
nosleep mode.
BugLink: https://bugs.launchpad.net/bugs/1791427
Cc: <stable@vger.kernel.org>
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
---
drivers/input/rmi4/rmi_f01.c | 45 ++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c
index 4edaa14fe878..e41d1ec625d9 100644
--- a/drivers/input/rmi4/rmi_f01.c
+++ b/drivers/input/rmi4/rmi_f01.c
@@ -325,12 +325,57 @@ static ssize_t rmi_driver_package_id_show(struct device *dev,
static DEVICE_ATTR(package_id, 0444, rmi_driver_package_id_show, NULL);
+static ssize_t rmi_driver_nosleep_show(struct device *dev,
+ struct device_attribute *dattr,
+ char *buf)
+{
+ struct rmi_driver_data *data = dev_get_drvdata(dev);
+ struct f01_data *f01 = dev_get_drvdata(&data->f01_container->dev);
+ int f01_nosleep;
+
+ f01_nosleep = ((f01->device_control.ctrl0 & RMI_F01_CTRL0_NOSLEEP_BIT)
+ ? 1 : 0);
+
+ return scnprintf(buf, PAGE_SIZE, "%d\n", f01_nosleep);
+}
+
+static ssize_t rmi_driver_nosleep_store(struct device *dev,
+ struct device_attribute *dattr,
+ const char *buf, size_t count)
+{
+ struct rmi_driver_data *data = dev_get_drvdata(dev);
+ struct f01_data *f01 = dev_get_drvdata(&data->f01_container->dev);
+ int error;
+
+ if (count <= 0)
+ return count;
+
+ if ('0' == *buf) {
+ f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT;
+ } else {
+ f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT;
+ }
+
+ error = rmi_write(data->rmi_dev,
+ data->f01_container->fd.control_base_addr,
+ f01->device_control.ctrl0);
+ if (error) {
+ dev_err(dev, "Failed to write nosleep mode: %d.\n", error);
+ }
+
+ return count;
+}
+
+static DEVICE_ATTR(nosleep, 0644,
+ rmi_driver_nosleep_show, rmi_driver_nosleep_store);
+
static struct attribute *rmi_f01_attrs[] = {
&dev_attr_manufacturer_id.attr,
&dev_attr_date_of_manufacture.attr,
&dev_attr_product_id.attr,
&dev_attr_firmware_id.attr,
&dev_attr_package_id.attr,
+ &dev_attr_nosleep.attr,
NULL
};
--
2.17.1
next prev parent reply other threads:[~2019-02-20 16:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 16:41 [PATCH 1/2] Input: synaptics-rmi4 - clear irqs before set irqs Aaron Ma
2019-02-20 16:42 ` Aaron Ma [this message]
2019-06-09 16:53 ` [PATCH 2/2] Input: synaptics-rmi4 - export nosleep of f01 via sysfs Dmitry Torokhov
2019-03-08 23:13 ` [PATCH 1/2] Input: synaptics-rmi4 - clear irqs before set irqs Christopher Heiny
2019-03-09 8:37 ` Aaron Ma
2019-03-28 6:02 ` Aaron Ma
2019-04-02 16:16 ` Christopher Heiny
2019-04-03 13:58 ` Aaron Ma
2019-06-04 2:45 ` Aaron Ma
2019-06-04 5:19 ` Christopher Heiny
2019-06-07 7:48 ` Aaron Ma
2019-06-09 16:55 ` Dmitry Torokhov
2019-06-10 16:55 ` Aaron Ma
2019-06-11 17:35 ` Dmitry Torokhov
2019-06-14 4:26 ` Aaron Ma
2019-11-19 5:34 ` Kai-Heng Feng
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=20190220164200.31044-2-aaron.ma@canonical.com \
--to=aaron.ma@canonical.com \
--cc=Cheiny@synaptics.com \
--cc=aduggan@synaptics.com \
--cc=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).