Commit 0cc16889 authored by Sudeep Holla's avatar Sudeep Holla Committed by Simon Horman

ARM: dts: shmobile/r8a7xxx: 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.
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 761b11e1
...@@ -110,7 +110,7 @@ zero-key { ...@@ -110,7 +110,7 @@ zero-key {
gpios = <&pfc 324 GPIO_ACTIVE_LOW>; gpios = <&pfc 324 GPIO_ACTIVE_LOW>;
linux,code = <KEY_0>; linux,code = <KEY_0>;
label = "S16"; label = "S16";
gpio-key,wakeup; wakeup-source;
}; };
menu-key { menu-key {
......
...@@ -85,7 +85,7 @@ power-key { ...@@ -85,7 +85,7 @@ power-key {
gpios = <&pfc 99 GPIO_ACTIVE_LOW>; gpios = <&pfc 99 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
label = "SW3"; label = "SW3";
gpio-key,wakeup; wakeup-source;
}; };
back-key { back-key {
......
...@@ -77,28 +77,28 @@ keyboard { ...@@ -77,28 +77,28 @@ keyboard {
button@1 { button@1 {
linux,code = <KEY_1>; linux,code = <KEY_1>;
label = "SW2-1"; label = "SW2-1";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
}; };
button@2 { button@2 {
linux,code = <KEY_2>; linux,code = <KEY_2>;
label = "SW2-2"; label = "SW2-2";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
}; };
button@3 { button@3 {
linux,code = <KEY_3>; linux,code = <KEY_3>;
label = "SW2-3"; label = "SW2-3";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
gpios = <&gpio1 26 GPIO_ACTIVE_LOW>; gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;
}; };
button@4 { button@4 {
linux,code = <KEY_4>; linux,code = <KEY_4>;
label = "SW2-4"; label = "SW2-4";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
}; };
......
...@@ -79,77 +79,77 @@ key-1 { ...@@ -79,77 +79,77 @@ key-1 {
gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
linux,code = <KEY_1>; linux,code = <KEY_1>;
label = "SW2-1"; label = "SW2-1";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-2 { key-2 {
gpios = <&gpio5 1 GPIO_ACTIVE_LOW>; gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_2>; linux,code = <KEY_2>;
label = "SW2-2"; label = "SW2-2";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-3 { key-3 {
gpios = <&gpio5 2 GPIO_ACTIVE_LOW>; gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_3>; linux,code = <KEY_3>;
label = "SW2-3"; label = "SW2-3";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-4 { key-4 {
gpios = <&gpio5 3 GPIO_ACTIVE_LOW>; gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_4>; linux,code = <KEY_4>;
label = "SW2-4"; label = "SW2-4";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-a { key-a {
gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
linux,code = <KEY_A>; linux,code = <KEY_A>;
label = "SW30"; label = "SW30";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-b { key-b {
gpios = <&gpio7 1 GPIO_ACTIVE_LOW>; gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_B>; linux,code = <KEY_B>;
label = "SW31"; label = "SW31";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-c { key-c {
gpios = <&gpio7 2 GPIO_ACTIVE_LOW>; gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_C>; linux,code = <KEY_C>;
label = "SW32"; label = "SW32";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-d { key-d {
gpios = <&gpio7 3 GPIO_ACTIVE_LOW>; gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_D>; linux,code = <KEY_D>;
label = "SW33"; label = "SW33";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-e { key-e {
gpios = <&gpio7 4 GPIO_ACTIVE_LOW>; gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_E>; linux,code = <KEY_E>;
label = "SW34"; label = "SW34";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-f { key-f {
gpios = <&gpio7 5 GPIO_ACTIVE_LOW>; gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_F>; linux,code = <KEY_F>;
label = "SW35"; label = "SW35";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
key-g { key-g {
gpios = <&gpio7 6 GPIO_ACTIVE_LOW>; gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_G>; linux,code = <KEY_G>;
label = "SW36"; label = "SW36";
gpio-key,wakeup; wakeup-source;
debounce-interval = <20>; debounce-interval = <20>;
}; };
}; };
......
...@@ -147,7 +147,7 @@ home-key { ...@@ -147,7 +147,7 @@ home-key {
gpios = <&pcf8575 14 GPIO_ACTIVE_LOW>; gpios = <&pcf8575 14 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
label = "SW1"; label = "SW1";
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment