From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: linux-input@vger.kernel.org, devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Daniel Mack <zonque@gmail.com>,
Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 2/6] Input: ads7846 - change name of wakeup property to "wakeup-source"
Date: Fri, 17 Jul 2015 17:36:17 -0700 [thread overview]
Message-ID: <1437179781-21124-3-git-send-email-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <1437179781-21124-1-git-send-email-dmitry.torokhov@gmail.com>
Wakeup property of device is not Linux-specific, it describes intended
system behavior regardless of the OS being used. Therefore let's drop
"linux," prefix, and, while at it, use the same name as I2C bus does:
"wakeup-source".
We keep parsing old name to keep compatibility with old DTSes.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
Documentation/devicetree/bindings/input/ads7846.txt | 2 +-
drivers/input/touchscreen/ads7846.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/input/ads7846.txt b/Documentation/devicetree/bindings/input/ads7846.txt
index 5f7619c..df8b127 100644
--- a/Documentation/devicetree/bindings/input/ads7846.txt
+++ b/Documentation/devicetree/bindings/input/ads7846.txt
@@ -64,7 +64,7 @@ Optional properties:
pendown-gpio (u32).
pendown-gpio GPIO handle describing the pin the !PENIRQ
line is connected to.
- linux,wakeup use any event on touchscreen as wakeup event.
+ wakeup-source use any event on touchscreen as wakeup event.
Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index e4eb8a6..0f5f968 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -1234,7 +1234,8 @@ static const struct ads7846_platform_data *ads7846_probe_dt(struct device *dev)
of_property_read_u32(node, "ti,pendown-gpio-debounce",
&pdata->gpio_pendown_debounce);
- pdata->wakeup = of_property_read_bool(node, "linux,wakeup");
+ pdata->wakeup = of_property_read_bool(node, "wakeup-source") ||
+ of_property_read_bool(node, "linux,wakeup");
pdata->gpio_pendown = of_get_named_gpio(dev->of_node, "pendown-gpio", 0);
--
2.4.3.573.g4eafbef
next prev parent reply other threads:[~2015-07-18 0:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-18 0:36 [PATCH 0/6] Input: standardize on "wakeup-source" property Dmitry Torokhov
2015-07-18 0:36 ` Dmitry Torokhov
2015-07-18 0:36 ` [PATCH 1/6] Input: matrix_keypad - change name of wakeup property to "wakeup-source" Dmitry Torokhov
2015-07-18 0:36 ` Dmitry Torokhov [this message]
2015-07-18 0:36 ` [PATCH 3/6] Input: pmic8xxx-keypad - change name of wakeup property Dmitry Torokhov
2015-07-18 0:36 ` Dmitry Torokhov
2015-07-18 0:42 ` Stephen Boyd
2015-07-18 0:36 ` [PATCH 4/6] Input: gpio_keys[_polled] " Dmitry Torokhov
2015-07-20 9:20 ` Linus Walleij
2015-07-20 9:20 ` Linus Walleij
2015-07-18 0:36 ` [PATCH 5/6] Input: samsung-keypad " Dmitry Torokhov
2015-07-18 0:36 ` [PATCH 6/6] Input: tc3589x-keypad " Dmitry Torokhov
2015-07-18 0:36 ` Dmitry Torokhov
2015-07-20 9:21 ` Linus Walleij
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=1437179781-21124-3-git-send-email-dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=zonque@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.