ARM: dts: r8a7794: replace gpio-key, wakeup with wakeup-source property

PATCH New Simon Horman 4 participants 4 messages Feb 15, 2016 – Feb 17, 2016 Device tree bindings

Share & tools

Simon Horman

author

2016-02-15 21:48 UTC #0 lore raw

PATCH 1/1 ARM: dts: r8a7794: replace gpio-key, wakeup with wakeup-source property

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 <[email protected]>

Reported-by Geert Uytterhoeven <[email protected]>

Signed-off-by Simon Horman <[email protected]>

---
 arch/arm/boot/dts/r8a7793-gose.dts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

arch/arm/boot/dts/r8a7793-gose.dts +11 ~~-11~~

index cfe142c2ba38..87e89ec9dd47 100644
@@ -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>;
 		};
 	};

Signature · 1 line

2.7.0.rc3.207.g0ac5344

Geert Uytterhoeven

2016-02-16 06:37 UTC #1 lore raw

PATCH 1/1 ARM: dts: r8a7794: replace gpio-key,wakeup with wakeup-source property

Quoted 9 lines · Simon Horman

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.

Quoted 5 lines

Changelog text from a similar patch by Sudeep Holla.
Cc Sudeep Holla <[email protected]>
Reported-by Geert Uytterhoeven <[email protected]>
Signed-off-by Simon Horman <[email protected]>

Acked-by Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

Sudeep Holla

2016-02-16 09:56 UTC #2 lore raw

PATCH 1/1 ARM: dts: r8a7794: replace gpio-key,wakeup with wakeup-source property

In reply to Simon Horman

Quoted 5 lines · Simon Horman

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.

Quoted 7 lines

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 <[email protected]>

Thanks for doing this, not sure how I missed it, was this merged in v4.5?

Acked-by Sudeep Holla <[email protected]>

Signature · 2 lines

Regards,
Sudeep

Simon Horman

2016-02-17 05:54 UTC #3 lore raw

PATCH 1/1 ARM: dts: r8a7794: replace gpio-key,wakeup with wakeup-source property

Quoted 12 lines · Sudeep Holla

Quoted 9 lines · Simon Horman
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.

Quoted 5 lines

Quoted 3 lines
Changelog text from a similar patch by Sudeep Holla.
Cc Sudeep Holla <[email protected]>
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.