Skip to content

L
linux
Commit 0c4d63b3 authored by Sudeep Holla's avatar Sudeep Holla Committed by Tony Lindgren
Browse files
Options

ARM: dts: omap: replace legacy *,wakeup property with wakeup-source 

Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux,wakeup" boolean property to enable the wakeup
source, "wakeup-source" is the new standard binding.

This patch replaces all the legacy wakeup properties with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: "Benoît Cousson" <bcousson@baylibre.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 3efda001
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 57 deletions
arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
View file @ 0c4d63b3
......@@ -23,28 +23,28 @@ sysboot2 {
label = "sysboot2";
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; /* gpio2 */
linux,code = <BTN_0>;
gpio-key,wakeup;
wakeup-source;
};
sysboot5 {
label = "sysboot5";
gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; /* gpio7 */
linux,code = <BTN_1>;
gpio-key,wakeup;
wakeup-source;
};
gpio1 {
label = "gpio1";
gpios = <&gpio6 21 GPIO_ACTIVE_LOW>; /* gpio181 */
linux,code = <BTN_2>;
gpio-key,wakeup;
wakeup-source;
};
gpio2 {
label = "gpio2";
gpios = <&gpio6 18 GPIO_ACTIVE_LOW>; /* gpio178 */
linux,code = <BTN_3>;
gpio-key,wakeup;
wakeup-source;
};
};
......
arch/arm/boot/dts/omap3-beagle-xm.dts
View file @ 0c4d63b3
......@@ -69,7 +69,7 @@ user {
label = "user";
gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
linux,code = <0x114>;
gpio-key,wakeup;
wakeup-source;
};
};
......
arch/arm/boot/dts/omap3-beagle.dts
View file @ 0c4d63b3
......@@ -80,7 +80,7 @@ user {
label = "user";
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
linux,code = <0x114>;
gpio-key,wakeup;
wakeup-source;
};
};
......
arch/arm/boot/dts/omap3-cm-t3x.dtsi
View file @ 0c4d63b3
......@@ -238,7 +238,7 @@ ads7846@0 {
ti,debounce-tol = /bits/ 16 <10>;
ti,debounce-rep = /bits/ 16 <1>;
linux,wakeup;
wakeup-source;
};
};
......
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
View file @ 0c4d63b3
......@@ -64,7 +64,7 @@ user {
label = "user";
gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
linux,code = <BTN_EXTRA>;
gpio-key,wakeup;
wakeup-source;
};
};
......
arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
View file @ 0c4d63b3
......@@ -68,6 +68,6 @@ ads7846@0 {
ti,keep-vref-on = <1>;
ti,settle-delay-usec = /bits/ 16 <150>;
linux,wakeup;
wakeup-source;
};
};
arch/arm/boot/dts/omap3-gta04.dtsi
View file @ 0c4d63b3
......@@ -37,7 +37,7 @@ aux-button {
label = "aux";
linux,code = <169>;
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
gpio-key,wakeup;
wakeup-source;
};
};
......
arch/arm/boot/dts/omap3-ldp.dts
View file @ 0c4d63b3
......@@ -35,63 +35,63 @@ key_enter {
label = "enter";
gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; /* gpio101 */
linux,code = <KEY_ENTER>;
gpio-key,wakeup;
wakeup-source;
};
key_f1 {
label = "f1";
gpios = <&gpio4 6 GPIO_ACTIVE_LOW>; /* gpio102 */
linux,code = <KEY_F1>;
gpio-key,wakeup;
wakeup-source;
};
key_f2 {
label = "f2";
gpios = <&gpio4 7 GPIO_ACTIVE_LOW>; /* gpio103 */
linux,code = <KEY_F2>;
gpio-key,wakeup;
wakeup-source;
};
key_f3 {
label = "f3";
gpios = <&gpio4 8 GPIO_ACTIVE_LOW>; /* gpio104 */
linux,code = <KEY_F3>;
gpio-key,wakeup;
wakeup-source;
};
key_f4 {
label = "f4";
gpios = <&gpio4 9 GPIO_ACTIVE_LOW>; /* gpio105 */
linux,code = <KEY_F4>;
gpio-key,wakeup;
wakeup-source;
};
key_left {
label = "left";
gpios = <&gpio4 10 GPIO_ACTIVE_LOW>; /* gpio106 */
linux,code = <KEY_LEFT>;
gpio-key,wakeup;
wakeup-source;
};
key_right {
label = "right";
gpios = <&gpio4 11 GPIO_ACTIVE_LOW>; /* gpio107 */
linux,code = <KEY_RIGHT>;
gpio-key,wakeup;
wakeup-source;
};
key_up {
label = "up";
gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; /* gpio108 */
linux,code = <KEY_UP>;
gpio-key,wakeup;
wakeup-source;
};
key_down {
label = "down";
gpios = <&gpio4 13 GPIO_ACTIVE_LOW>; /* gpio109 */
linux,code = <KEY_DOWN>;
gpio-key,wakeup;
wakeup-source;
};
};
};
......
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
View file @ 0c4d63b3
......@@ -327,7 +327,7 @@ tsc2046@0 {
ti,pressure-max = /bits/ 16 <255>;
ti,swap-xy;
linux,wakeup;
wakeup-source;
};
};
......
arch/arm/boot/dts/omap3-n900.dts
View file @ 0c4d63b3
......@@ -67,28 +67,28 @@ camera_lens_cover {
gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* 110 */
linux,input-type = <5>; /* EV_SW */
linux,code = <0x09>; /* SW_CAMERA_LENS_COVER */
gpio-key,wakeup;
wakeup-source;
};
camera_focus {
label = "Camera Focus";
gpios = <&gpio3 4 GPIO_ACTIVE_LOW>; /* 68 */
linux,code = <0x210>; /* KEY_CAMERA_FOCUS */
gpio-key,wakeup;
wakeup-source;
};
camera_capture {
label = "Camera Capture";
gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; /* 69 */
linux,code = <0xd4>; /* KEY_CAMERA */
gpio-key,wakeup;
wakeup-source;
};
lock_button {
label = "Lock Button";
gpios = <&gpio4 17 GPIO_ACTIVE_LOW>; /* 113 */
linux,code = <0x98>; /* KEY_SCREENLOCK */
gpio-key,wakeup;
wakeup-source;
};
keypad_slide {
......@@ -96,7 +96,7 @@ keypad_slide {
gpios = <&gpio3 7 GPIO_ACTIVE_LOW>; /* 71 */
linux,input-type = <5>; /* EV_SW */
linux,code = <0x0a>; /* SW_KEYPAD_SLIDE */
gpio-key,wakeup;
wakeup-source;
};
proximity_sensor {
......
arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
View file @ 0c4d63b3
......@@ -48,7 +48,7 @@ button0@10 {
label = "button0";
linux,code = <BTN_0>;
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; /* gpio_10 */
gpio-key,wakeup;
wakeup-source;
};
};
};
......
arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
View file @ 0c4d63b3
......@@ -41,13 +41,13 @@ button0@23 {
label = "button0";
linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
gpio-key,wakeup;
wakeup-source;
};
button1@14 {
label = "button1";
linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */
gpio-key,wakeup;
wakeup-source;
};
};
};
......
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
View file @ 0c4d63b3
......@@ -161,6 +161,6 @@ ads7846@0 {
ti,x-plate-ohms = /bits/ 16 <180>;
ti,pressure-max = /bits/ 16 <255>;
linux,wakeup;
wakeup-source;
};
};
arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
View file @ 0c4d63b3
......@@ -172,7 +172,7 @@ ads7846@0 {
ti,x-plate-ohms = /bits/ 16 <180>;
ti,pressure-max = /bits/ 16 <255>;
linux,wakeup;
wakeup-source;
};
};
arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
View file @ 0c4d63b3
......@@ -41,13 +41,13 @@ button0@23 {
label = "button0";
linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
gpio-key,wakeup;
wakeup-source;
};
button1@14 {
label = "button1";
linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */
gpio-key,wakeup;
wakeup-source;
};
};
};
......
arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
View file @ 0c4d63b3
......@@ -41,13 +41,13 @@ button0@23 {
label = "button0";
linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
gpio-key,wakeup;
wakeup-source;
};
button1@14 {
label = "button1";
linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */
gpio-key,wakeup;
wakeup-source;
};
};
};
arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
View file @ 0c4d63b3
......@@ -41,13 +41,13 @@ button0@23 {
label = "button0";
linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
gpio-key,wakeup;
wakeup-source;
};
button1@14 {
label = "button1";
linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */
gpio-key,wakeup;
wakeup-source;
};
};
};
......
arch/arm/boot/dts/omap3-pandora-common.dtsi
View file @ 0c4d63b3
......@@ -84,112 +84,112 @@ up-button {
label = "up";
linux,code = <KEY_UP>;
gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* GPIO_110 */
gpio-key,wakeup;
wakeup-source;
};
down-button {
label = "down";
linux,code = <KEY_DOWN>;
gpios = <&gpio4 7 GPIO_ACTIVE_LOW>; /* GPIO_103 */
gpio-key,wakeup;
wakeup-source;
};
left-button {
label = "left";
linux,code = <KEY_LEFT>;
gpios = <&gpio4 0 GPIO_ACTIVE_LOW>; /* GPIO_96 */
gpio-key,wakeup;
wakeup-source;
};
right-button {
label = "right";
linux,code = <KEY_RIGHT>;
gpios = <&gpio4 2 GPIO_ACTIVE_LOW>; /* GPIO_98 */
gpio-key,wakeup;
wakeup-source;
};
pageup-button {
label = "game 1";
linux,code = <KEY_PAGEUP>;
gpios = <&gpio4 13 GPIO_ACTIVE_LOW>; /* GPIO_109 */
gpio-key,wakeup;
wakeup-source;
};
pagedown-button {
label = "game 3";
linux,code = <KEY_PAGEDOWN>;
gpios = <&gpio4 10 GPIO_ACTIVE_LOW>; /* GPIO_106 */
gpio-key,wakeup;
wakeup-source;
};
home-button {
label = "game 4";
linux,code = <KEY_HOME>;
gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; /* GPIO_101 */
gpio-key,wakeup;
wakeup-source;
};
end-button {
label = "game 2";
linux,code = <KEY_END>;
gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* GPIO_111 */
gpio-key,wakeup;
wakeup-source;
};
right-shift {
label = "l";
linux,code = <KEY_RIGHTSHIFT>;
gpios = <&gpio4 6 GPIO_ACTIVE_LOW>; /* GPIO_102 */
gpio-key,wakeup;
wakeup-source;
};
kp-plus {
label = "l2";
linux,code = <KEY_KPPLUS>;
gpios = <&gpio4 1 GPIO_ACTIVE_LOW>; /* GPIO_97 */
gpio-key,wakeup;
wakeup-source;
};
right-ctrl {
label = "r";
linux,code = <KEY_RIGHTCTRL>;
gpios = <&gpio4 9 GPIO_ACTIVE_LOW>; /* GPIO_105 */
gpio-key,wakeup;
wakeup-source;
};
kp-minus {
label = "r2";
linux,code = <KEY_KPMINUS>;
gpios = <&gpio4 11 GPIO_ACTIVE_LOW>; /* GPIO_107 */
gpio-key,wakeup;
wakeup-source;
};
left-ctrl {
label = "ctrl";
linux,code = <KEY_LEFTCTRL>;
gpios = <&gpio4 8 GPIO_ACTIVE_LOW>; /* GPIO_104 */
gpio-key,wakeup;
wakeup-source;
};
menu {
label = "menu";
linux,code = <KEY_MENU>;
gpios = <&gpio4 3 GPIO_ACTIVE_LOW>; /* GPIO_99 */
gpio-key,wakeup;
wakeup-source;
};
hold {
label = "hold";
linux,code = <KEY_COFFEE>;
gpios = <&gpio6 16 GPIO_ACTIVE_LOW>; /* GPIO_176 */
gpio-key,wakeup;
wakeup-source;
};
left-alt {
label = "alt";
linux,code = <KEY_LEFTALT>;
gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>; /* GPIO_100 */
gpio-key,wakeup;
wakeup-source;
};
lid {
......@@ -617,7 +617,7 @@ tsc2046@0 {
ti,x-plate-ohms = /bits/ 16 <40>;
ti,pressure-max = /bits/ 16 <255>;
linux,wakeup;
wakeup-source;
};
lcd: lcd@1 {
......
arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
View file @ 0c4d63b3
......@@ -66,6 +66,6 @@ tsc2046@0 {
ti,x-plate-ohms = /bits/ 16 <40>;
ti,pressure-max = /bits/ 16 <255>;
ti,swap-xy;
linux,wakeup;
wakeup-source;
};
};
arch/arm/boot/dts/omap4-duovero-parlor.dts
View file @ 0c4d63b3
......@@ -36,7 +36,7 @@ button0@121 {
label = "button0";
linux,code = <BTN_0>;
gpios = <&gpio4 25 GPIO_ACTIVE_LOW>; /* gpio_121 */
gpio-key,wakeup;
wakeup-source;
};
};
......
arch/arm/boot/dts/omap4-var-om44customboard.dtsi
View file @ 0c4d63b3
......@@ -41,7 +41,7 @@ user-key@184 {
label = "user";
gpios = <&gpio6 24 GPIO_ACTIVE_HIGH>; /* gpio 184 */
linux,code = <BTN_EXTRA>;
gpio-key,wakeup;
wakeup-source;
};
};
......
arch/arm/boot/dts/omap5-cm-t54.dts
View file @ 0c4d63b3
......@@ -359,7 +359,7 @@ ads7846@0 {
ti,debounce-tol = /bits/ 16 <10>;
ti,debounce-rep = /bits/ 16 <1>;
linux,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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7