[PATCH] input: snvs_pwrkey: add linux prefix for wakeup property

Zhi Li lznuaa at gmail.com
Wed Jul 15 07:00:12 PDT 2015


On Tue, Jul 14, 2015 at 10:20 PM, Shawn Guo <shawnguo at kernel.org> wrote:
> 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 at 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:

I remember Dmitry Torokhov said use wakeup, instead of linux, wakeup
when I sent patch to review.

best regards
Frank Li

>        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
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel



More information about the linux-arm-kernel mailing list