Skip to content

Commit

Permalink
ARM: at91/dt: replace gpio-key,wakeup with wakeup-source property
Browse files Browse the repository at this point in the history 
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.

Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
  • Loading branch information
Sudeep Holla authored and Nicolas Ferre committed Nov 16, 2015
1 parent f67d846 commit 67ae8b9
Show file tree
Hide file tree
Showing 18 changed files with 32 additions and 32 deletions.
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/animeo_ip.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,21 @@
label = "keyswitch_in";
gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
linux,code = <28>;
gpio-key,wakeup;
wakeup-source;
};

error_in {
label = "error_in";
gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
linux,code = <29>;
gpio-key,wakeup;
wakeup-source;
};

btn {
label = "btn";
gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
linux,code = <31>;
gpio-key,wakeup;
wakeup-source;
};
};
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91-foxg20.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
label = "Button";
gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
linux,code = <0x103>;
gpio-key,wakeup;
wakeup-source;
};
};
};
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/at91-kizbox.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@
label = "PB_RST";
gpios = <&pioB 30 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>;
gpio-key,wakeup;
wakeup-source;
};

user {
label = "PB_USER";
gpios = <&pioB 31 GPIO_ACTIVE_HIGH>;
linux,code = <0x101>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/at91-kizbox2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,21 +171,21 @@
label = "PB_PROG";
gpios = <&pioE 27 GPIO_ACTIVE_LOW>;
linux,code = <0x102>;
gpio-key,wakeup;
wakeup-source;
};

reset {
label = "PB_RST";
gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
linux,code = <0x100>;
gpio-key,wakeup;
wakeup-source;
};

user {
label = "PB_USER";
gpios = <&pioE 31 GPIO_ACTIVE_HIGH>;
linux,code = <0x101>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/at91-kizboxmini.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@
label = "PB_PROG";
gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
linux,code = <0x102>;
gpio-key,wakeup;
wakeup-source;
};

reset {
label = "PB_RST";
gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
linux,code = <0x100>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91-qil_a9260.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
label = "user_pb";
gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91-sama5d3_xplained.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
label = "PB_USER";
gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91-sama5d4_xplained.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
label = "pb_user1";
gpios = <&pioE 8 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91-sama5d4ek.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
label = "pb_user1";
gpios = <&pioE 13 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
10 changes: 5 additions & 5 deletions arch/arm/boot/dts/at91sam9261ek.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
ti,debounce-tol = /bits/ 16 <65535>;
ti,debounce-max = /bits/ 16 <1>;

linux,wakeup;
wakeup-source;
};
};

Expand Down Expand Up @@ -193,28 +193,28 @@
label = "button_0";
gpios = <&pioA 27 GPIO_ACTIVE_LOW>;
linux,code = <256>;
gpio-key,wakeup;
wakeup-source;
};

button_1 {
label = "button_1";
gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
linux,code = <257>;
gpio-key,wakeup;
wakeup-source;
};

button_2 {
label = "button_2";
gpios = <&pioA 25 GPIO_ACTIVE_LOW>;
linux,code = <258>;
gpio-key,wakeup;
wakeup-source;
};

button_3 {
label = "button_3";
gpios = <&pioA 24 GPIO_ACTIVE_LOW>;
linux,code = <259>;
gpio-key,wakeup;
wakeup-source;
};
};
};
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/at91sam9263ek.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,14 @@
label = "left_click";
gpios = <&pioC 5 GPIO_ACTIVE_LOW>;
linux,code = <272>;
gpio-key,wakeup;
wakeup-source;
};

right_click {
label = "right_click";
gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
linux,code = <273>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/at91sam9g20ek_common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@
label = "Button 3";
gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
linux,code = <0x103>;
gpio-key,wakeup;
wakeup-source;
};

btn4 {
label = "Button 4";
gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/at91sam9m10g45ek.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,14 +323,14 @@
label = "left_click";
gpios = <&pioB 6 GPIO_ACTIVE_LOW>;
linux,code = <272>;
gpio-key,wakeup;
wakeup-source;
};

right_click {
label = "right_click";
gpios = <&pioB 7 GPIO_ACTIVE_LOW>;
linux,code = <273>;
gpio-key,wakeup;
wakeup-source;
};

left {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91sam9n12ek.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
label = "Enter";
gpios = <&pioB 3 GPIO_ACTIVE_LOW>;
linux,code = <28>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/at91sam9rlek.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,14 @@
label = "right_click";
gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
linux,code = <273>;
gpio-key,wakeup;
wakeup-source;
};

left_click {
label = "left_click";
gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
linux,code = <272>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/sama5d35ek.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
label = "pb_user1";
gpios = <&pioE 27 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>;
gpio-key,wakeup;
wakeup-source;
};
};
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/usb_a9260_common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
label = "user_pb";
gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/usb_a9263.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
label = "user_pb";
gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>;
gpio-key,wakeup;
wakeup-source;
};
};

Expand Down

0 comments on commit 67ae8b9

Please sign in to comment.