Commit d1c04d30 authored by Sudeep Holla's avatar Sudeep Holla Committed by Thierry Reding

ARM: tegra: Replace legacy *,wakeup property with wakeup-source

Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "nvidia,wakeup-source" 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 further copy-paste
duplication.

Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: linux-tegra@vger.kernel.org
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent b6641294
...@@ -1164,7 +1164,7 @@ power { ...@@ -1164,7 +1164,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
volume_down { volume_down {
......
...@@ -1047,7 +1047,7 @@ power { ...@@ -1047,7 +1047,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -292,7 +292,7 @@ power { ...@@ -292,7 +292,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
volume_down { volume_down {
......
...@@ -1787,7 +1787,7 @@ power { ...@@ -1787,7 +1787,7 @@ power {
gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
debounce-interval = <10>; debounce-interval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -509,7 +509,7 @@ lid { ...@@ -509,7 +509,7 @@ lid {
linux,input-type = <5>; linux,input-type = <5>;
linux,code = <KEY_RESERVED>; linux,code = <KEY_RESERVED>;
debounce-interval = <1>; debounce-interval = <1>;
gpio-key,wakeup; wakeup-source;
}; };
power { power {
...@@ -517,7 +517,7 @@ power { ...@@ -517,7 +517,7 @@ power {
gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
debounce-interval = <30>; debounce-interval = <30>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -975,7 +975,7 @@ power { ...@@ -975,7 +975,7 @@ power {
gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
debounce-interval = <10>; debounce-interval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -655,7 +655,7 @@ power { ...@@ -655,7 +655,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -521,7 +521,7 @@ power { ...@@ -521,7 +521,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -807,7 +807,7 @@ power { ...@@ -807,7 +807,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
lid { lid {
...@@ -816,7 +816,7 @@ lid { ...@@ -816,7 +816,7 @@ lid {
linux,input-type = <5>; /* EV_SW */ linux,input-type = <5>; /* EV_SW */
linux,code = <0>; /* SW_LID */ linux,code = <0>; /* SW_LID */
debounce-interval = <1>; debounce-interval = <1>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -392,7 +392,7 @@ power { ...@@ -392,7 +392,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -601,7 +601,7 @@ power { ...@@ -601,7 +601,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -508,7 +508,7 @@ kbc@7000e200 { ...@@ -508,7 +508,7 @@ kbc@7000e200 {
nvidia,repeat-delay-ms = <160>; nvidia,repeat-delay-ms = <160>;
nvidia,kbc-row-pins = <0 1 2>; nvidia,kbc-row-pins = <0 1 2>;
nvidia,kbc-col-pins = <16 17>; nvidia,kbc-col-pins = <16 17>;
nvidia,wakeup-source; wakeup-source;
linux,keymap = <MATRIX_KEY(0x00, 0x00, KEY_POWER) linux,keymap = <MATRIX_KEY(0x00, 0x00, KEY_POWER)
MATRIX_KEY(0x01, 0x00, KEY_HOME) MATRIX_KEY(0x01, 0x00, KEY_HOME)
MATRIX_KEY(0x01, 0x01, KEY_BACK) MATRIX_KEY(0x01, 0x01, KEY_BACK)
......
...@@ -196,7 +196,7 @@ wakeup { ...@@ -196,7 +196,7 @@ wakeup {
gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_LOW>;
linux,code = <KEY_WAKEUP>; linux,code = <KEY_WAKEUP>;
debounce-interval = <10>; debounce-interval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -626,7 +626,7 @@ power { ...@@ -626,7 +626,7 @@ power {
interrupts = <2 0>; interrupts = <2 0>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
debounce-interval = <100>; debounce-interval = <100>;
gpio-key,wakeup; wakeup-source;
}; };
volume-down { volume-down {
......
...@@ -142,7 +142,7 @@ wakeup { ...@@ -142,7 +142,7 @@ wakeup {
gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>; gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
linux,code = <KEY_WAKEUP>; linux,code = <KEY_WAKEUP>;
debounce-interval = <10>; debounce-interval = <10>;
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