| Message ID | 1436930409-6536-1-git-send-email-shawnguo@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 14, 2015 at 10:20 PM, Shawn Guo <shawnguo@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@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@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Wed, Jul 15, 2015 at 09:00:12AM -0500, Zhi Li wrote: > On Tue, Jul 14, 2015 at 10:20 PM, Shawn Guo <shawnguo@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. I do not believe it is Linux specific, it describes desired behavior of hardware regardless of OS. I mean you want your device to wake up if you press power button whether it runes Linux, Windows, FreeBSD or whatever. > > > > 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: > > I remember Dmitry Torokhov said use wakeup, instead of linux, wakeup > when I sent patch to review. I should have said to use "wakeup-source", not simply "wakeup" so that we'd match with I2C annotation. I think I'll go over input driver and convert them (keeping old names for compatibility reasons). Thanks.
On Thu, Jul 16, 2015 at 11:34:08AM -0700, Dmitry Torokhov wrote: > I should have said to use "wakeup-source", not simply "wakeup" so that > we'd match with I2C annotation. Yeah, consistency is the real motivation of this patch. I do not like that different properties are invented for the same purpose. As it seems that subsystems are all moving to "wakeup-source", I would be happy to get it consistent with that. V2 will be coming soon. Shawn
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) {
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(-)