From: Shawn Guo <shawnguo@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org, linux-input@vger.kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Frank Li <Frank.Li@freescale.com>,
Shawn Guo <shawnguo@kernel.org>
Subject: [PATCH] input: snvs_pwrkey: add linux prefix for wakeup property
Date: Wed, 15 Jul 2015 11:20:09 +0800 [thread overview]
Message-ID: <1436930409-6536-1-git-send-email-shawnguo@kernel.org> (raw)
The wakeup capability is somehow linux specific, and all existing
bindings name the property "linux,wakeup" to reflect that, e.g.
Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt. Let's
follow the convention.
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
This is a fixup for Frank's patch which is queued on i.MX tree, so I
will apply it to the same branch.
Shawn
Documentation/devicetree/bindings/crypto/fsl-sec4.txt | 2 +-
drivers/input/keyboard/snvs_pwrkey.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index 71a39c5bd486..fa821c6a0b5b 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -408,7 +408,7 @@ System ON/OFF key driver
Value type: <int>
Definition: Keycode to emit, KEY_POWER by default.
- - wakeup:
+ - linux,wakeup:
Usage: option
Value type: <boo>
Definition: Button can wake-up the system.
diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c
index 512a1fc2a864..021b7c1ddc2f 100644
--- a/drivers/input/keyboard/snvs_pwrkey.c
+++ b/drivers/input/keyboard/snvs_pwrkey.c
@@ -122,7 +122,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
dev_warn(&pdev->dev, "KEY_POWER without setting in dts\n");
}
- pdata->wakeup = of_property_read_bool(np, "wakeup");
+ pdata->wakeup = of_property_read_bool(np, "linux,wakeup");
pdata->irq = platform_get_irq(pdev, 0);
if (pdata->irq < 0) {
--
1.9.1
next reply other threads:[~2015-07-15 3:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 3:20 Shawn Guo [this message]
2015-07-15 14:00 ` [PATCH] input: snvs_pwrkey: add linux prefix for wakeup property Zhi Li
2015-07-16 18:34 ` Dmitry Torokhov
2015-07-17 3:46 ` Shawn Guo
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=1436930409-6536-1-git-send-email-shawnguo@kernel.org \
--to=shawnguo@kernel.org \
--cc=Frank.Li@freescale.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@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).