diff options
| author | Shawn Guo <shawnguo@kernel.org> | 2015-07-15 10:36:37 +0800 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2015-07-18 09:45:43 +0800 |
| commit | def56bba7a5c623fd887d1f4b4c864521d615a76 (patch) | |
| tree | b22b54ec2ad5f90c8a88d0c07d22ac052dfe1013 | |
| parent | cc28791d5ece61eaa78e7b9bbc3ac1d14f664683 (diff) | |
| download | op-kernel-dev-def56bba7a5c623fd887d1f4b4c864521d615a76.zip op-kernel-dev-def56bba7a5c623fd887d1f4b4c864521d615a76.tar.gz | |
input: snvs_pwrkey: use "wakeup-source" as deivce tree property name
Instead of inventing a new property name, let's use "wakeup-source" to
be consistent with other driver and subsystem bindings.
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| -rw-r--r-- | Documentation/devicetree/bindings/crypto/fsl-sec4.txt | 2 | ||||
| -rw-r--r-- | 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 71a39c5..f16bbd6 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: + - wakeup-source: 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 512a1fc..78fd24c 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, "wakeup-source"); pdata->irq = platform_get_irq(pdev, 0); if (pdata->irq < 0) { |
