| Message ID | 1455572925-27697-1-git-send-email-horms+renesas@verge.net.au (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Simon Horman |
| Headers | show |
On Mon, Feb 15, 2016 at 10:48 PM, Simon Horman <horms+renesas@verge.net.au> wrote: > Though the keyboard driver for GPIO buttons(gpio-keys) will continue to > check for/support the legacy "gpio-key,wakeup" boolean property to > enable gpio buttons as wakeup source, "wakeup-source" is the new > standard binding. > > This patch replaces the legacy "gpio-key,wakeup" with the unified > "wakeup-source" property in order to avoid any futher copy-paste > duplication. > > Changelog text from a similar patch by Sudeep Holla. > > Cc: Sudeep Holla <sudeep.holla@arm.com> > Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On 15/02/16 21:48, Simon Horman wrote: > Though the keyboard driver for GPIO buttons(gpio-keys) will continue to > check for/support the legacy "gpio-key,wakeup" boolean property to > enable gpio buttons as wakeup source, "wakeup-source" is the new > standard binding. > > This patch replaces the legacy "gpio-key,wakeup" with the unified > "wakeup-source" property in order to avoid any futher copy-paste > duplication. > > Changelog text from a similar patch by Sudeep Holla. > > Cc: Sudeep Holla <sudeep.holla@arm.com> Thanks for doing this, not sure how I missed it, was this merged in v4.5? Acked-by: Sudeep Holla <sudeep.holla@arm.com>
On Tue, Feb 16, 2016 at 09:56:54AM +0000, Sudeep Holla wrote: > > > On 15/02/16 21:48, Simon Horman wrote: > >Though the keyboard driver for GPIO buttons(gpio-keys) will continue to > >check for/support the legacy "gpio-key,wakeup" boolean property to > >enable gpio buttons as wakeup source, "wakeup-source" is the new > >standard binding. > > > >This patch replaces the legacy "gpio-key,wakeup" with the unified > >"wakeup-source" property in order to avoid any futher copy-paste > >duplication. > > > >Changelog text from a similar patch by Sudeep Holla. > > > >Cc: Sudeep Holla <sudeep.holla@arm.com> > > Thanks for doing this, not sure how I missed it, was this merged in v4.5? I believe it came later and it was my error not to include this in the change that added the nodes in question.
diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts index cfe142c2ba38..87e89ec9dd47 100644 --- a/arch/arm/boot/dts/r8a7793-gose.dts +++ b/arch/arm/boot/dts/r8a7793-gose.dts @@ -67,77 +67,77 @@ gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; linux,code = <KEY_1>; label = "SW2-1"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-2 { gpios = <&gpio5 1 GPIO_ACTIVE_LOW>; linux,code = <KEY_2>; label = "SW2-2"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-3 { gpios = <&gpio5 2 GPIO_ACTIVE_LOW>; linux,code = <KEY_3>; label = "SW2-3"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-4 { gpios = <&gpio5 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_4>; label = "SW2-4"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-a { gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; linux,code = <KEY_A>; label = "SW30"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-b { gpios = <&gpio7 1 GPIO_ACTIVE_LOW>; linux,code = <KEY_B>; label = "SW31"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-c { gpios = <&gpio7 2 GPIO_ACTIVE_LOW>; linux,code = <KEY_C>; label = "SW32"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-d { gpios = <&gpio7 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_D>; label = "SW33"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-e { gpios = <&gpio7 4 GPIO_ACTIVE_LOW>; linux,code = <KEY_E>; label = "SW34"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-f { gpios = <&gpio7 5 GPIO_ACTIVE_LOW>; linux,code = <KEY_F>; label = "SW35"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-g { gpios = <&gpio7 6 GPIO_ACTIVE_LOW>; linux,code = <KEY_G>; label = "SW36"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; };
Though the keyboard driver for GPIO buttons(gpio-keys) will continue to check for/support the legacy "gpio-key,wakeup" boolean property to enable gpio buttons as wakeup source, "wakeup-source" is the new standard binding. This patch replaces the legacy "gpio-key,wakeup" with the unified "wakeup-source" property in order to avoid any futher copy-paste duplication. Changelog text from a similar patch by Sudeep Holla. Cc: Sudeep Holla <sudeep.holla@arm.com> Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7793-gose.dts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)