From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: linux-input@vger.kernel.org, devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Jingoo Han <jg1.han@samsung.com>,
Joonyoung Shim <jy0922.shim@samsung.com>
Subject: [PATCH 5/6] Input: samsung-keypad - change name of wakeup property
Date: Fri, 17 Jul 2015 17:36:20 -0700 [thread overview]
Message-ID: <1437179781-21124-6-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/samsung-keypad.txt | 4 +++-
drivers/input/keyboard/samsung-keypad.c | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/input/samsung-keypad.txt b/Documentation/devicetree/bindings/input/samsung-keypad.txt
index 942d071..863e77f 100644
--- a/Documentation/devicetree/bindings/input/samsung-keypad.txt
+++ b/Documentation/devicetree/bindings/input/samsung-keypad.txt
@@ -36,9 +36,11 @@ Required Board Specific Properties:
- pinctrl-0: Should specify pin control groups used for this controller.
- pinctrl-names: Should contain only one value - "default".
+Optional Properties:
+- wakeup-source: use any event on keypad as wakeup event.
+
Optional Properties specific to linux:
- linux,keypad-no-autorepeat: do no enable autorepeat feature.
-- linux,keypad-wakeup: use any event on keypad as wakeup event.
Example:
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index 43e48dac..dc05f39 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -299,8 +299,10 @@ samsung_keypad_parse_dt(struct device *dev)
if (of_get_property(np, "linux,input-no-autorepeat", NULL))
pdata->no_autorepeat = true;
- if (of_get_property(np, "linux,input-wakeup", NULL))
- pdata->wakeup = true;
+ pdata->wakeup = of_property_read_bool(pp, "wakeup-source") ||
+ /* legacy name */
+ of_property_read_bool(pp, "linux,input-wakeup");
+
return pdata;
}
--
2.4.3.573.g4eafbef
prev parent reply other threads:[~2015-07-18 0:36 UTC|newest]
Thread overview: 10+ 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 ` [PATCH 1/6] Input: matrix_keypad - change name of wakeup property to "wakeup-source" Dmitry Torokhov
2015-07-18 0:36 ` [PATCH 2/6] Input: ads7846 " Dmitry Torokhov
[not found] ` <1437179781-21124-1-git-send-email-dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-07-18 0:36 ` [PATCH 3/6] Input: pmic8xxx-keypad - change name of wakeup property Dmitry Torokhov
2015-07-18 0:42 ` Stephen Boyd
2015-07-18 0:36 ` [PATCH 6/6] Input: tc3589x-keypad " Dmitry Torokhov
2015-07-20 9:21 ` Linus Walleij
2015-07-18 0:36 ` [PATCH 4/6] Input: gpio_keys[_polled] " Dmitry Torokhov
[not found] ` <1437179781-21124-5-git-send-email-dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-07-20 9:20 ` Linus Walleij
2015-07-18 0:36 ` Dmitry Torokhov [this message]
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-6-git-send-email-dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=jg1.han@samsung.com \
--cc=jy0922.shim@samsung.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).