From: Marco Felsch <m.felsch@pengutronix.de>
To: robh+dt@kernel.org, andriy.shevchenko@linux.intel.com,
dmitry.torokhov@gmail.com, bparrot@ti.com,
andy.shevchenko@gmail.com, simon.budig@kernelconcepts.de,
hdegoede@redhat.com, fcooper@ti.com, mripard@kernel.org,
alexandre.belloni@bootlin.com, shawnguo@kernel.org
Cc: devicetree@vger.kernel.org, kernel@pengutronix.de,
linux-input@vger.kernel.org
Subject: [PATCH v2 4/5] Input: edt-ft5x06 - make wakeup-source switchable
Date: Wed, 27 Nov 2019 13:09:47 +0100 [thread overview]
Message-ID: <20191127120948.22251-5-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20191127120948.22251-1-m.felsch@pengutronix.de>
Since day one the touch controller acts as wakeup-source. This seems to
be wrong since the device supports deep-sleep mechanism [1] which
requires a reset to leave it. Also some designs won't use the
touchscreen as wakeup-source.
According discussion [2] we decided to break backward compatibility and
go the common way by using the 'wakeup-source' device-property.
[1] https://www.newhavendisplay.com/appnotes/datasheets/touchpanel/FT5x26.pdf
[2] https://patchwork.kernel.org/patch/11149037/
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
v2:
- make use of common wakeup-source property
- adapt commit message
drivers/input/touchscreen/edt-ft5x06.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index e1b31fd525e2..8d2ec7947f0e 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -24,6 +24,7 @@
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/property.h>
#include <linux/ratelimit.h>
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
@@ -1056,6 +1057,7 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
unsigned long irq_flags;
int error;
char fw_version[EDT_NAME_LEN];
+ bool en_wakeup;
dev_dbg(&client->dev, "probing for EDT FT5x06 I2C\n");
@@ -1114,6 +1116,8 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
return error;
}
+ en_wakeup = device_property_present(&client->dev, "wakeup-source");
+
if (tsdata->wake_gpio) {
usleep_range(5000, 6000);
gpiod_set_value_cansleep(tsdata->wake_gpio, 1);
@@ -1208,7 +1212,7 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
return error;
edt_ft5x06_ts_prepare_debugfs(tsdata, dev_driver_string(&client->dev));
- device_init_wakeup(&client->dev, 1);
+ device_init_wakeup(&client->dev, en_wakeup);
dev_dbg(&client->dev,
"EDT FT5x06 initialized: IRQ %d, WAKE pin %d, Reset pin %d.\n",
--
2.20.1
next prev parent reply other threads:[~2019-11-27 12:10 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 12:09 [PATCH v2 0/5] EDT-FT5x06 improvements Marco Felsch
2019-11-27 12:09 ` [PATCH v2 1/5] Input: edt-ft5x06: work around first register access error Marco Felsch
2019-12-02 17:58 ` Dmitry Torokhov
2019-12-03 8:15 ` Marco Felsch
2019-11-27 12:09 ` [PATCH v2 2/5] Input: edt-ft5x06 - alphabetical include reorder Marco Felsch
2019-11-27 12:09 ` [PATCH v2 3/5] dt-bindings: Input: edt-ft5x06 - document wakeup-source capability Marco Felsch
2019-12-05 21:15 ` Rob Herring
2019-11-27 12:09 ` Marco Felsch [this message]
2019-12-02 18:00 ` [PATCH v2 4/5] Input: edt-ft5x06 - make wakeup-source switchable Dmitry Torokhov
2019-12-10 8:36 ` Marco Felsch
2019-11-27 12:09 ` [PATCH v2 5/5] Input: edt-ft5x06 - improve power management operations Marco Felsch
2019-11-27 12:59 ` Andy Shevchenko
2019-11-27 13:06 ` Marco Felsch
2019-11-27 14:32 ` Andy Shevchenko
2019-11-27 17:25 ` Marco Felsch
2019-11-27 18:06 ` Andy Shevchenko
2019-12-02 18:04 ` Dmitry Torokhov
2019-12-10 8:43 ` Marco Felsch
2019-11-27 17:10 ` [PATCH v2 0/5] EDT-FT5x06 improvements Andy Shevchenko
2019-11-27 17:14 ` Andy Shevchenko
2019-11-27 17:25 ` Marco Felsch
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=20191127120948.22251-5-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=alexandre.belloni@bootlin.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=bparrot@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=fcooper@ti.com \
--cc=hdegoede@redhat.com \
--cc=kernel@pengutronix.de \
--cc=linux-input@vger.kernel.org \
--cc=mripard@kernel.org \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.org \
--cc=simon.budig@kernelconcepts.de \
/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).