Skip to content

L
linux
Commit 36a0282a authored by Sudeep Holla's avatar Sudeep Holla Committed by Krzysztof Kozlowski
Browse files
Options

ARM: dts: Replace legacy *,wakeup property with wakeup-source for exynos boards 

Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux-keypad,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 further copy-paste
duplication.
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
parent 05053d7a
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
arch/arm/boot/dts/exynos3250-monk.dts
View file @ 36a0282a
...@@ -43,7 +43,7 @@ power_key { ...@@ -43,7 +43,7 @@ power_key {
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
label = "power key"; label = "power key";
debounce-interval = <10>; debounce-interval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
...@@ -67,7 +67,7 @@ max77836: subpmic@25 { ...@@ -67,7 +67,7 @@ max77836: subpmic@25 {
interrupt-parent = <&gpx1>; interrupt-parent = <&gpx1>;
interrupts = <5 0>; interrupts = <5 0>;
reg = <0x25>; reg = <0x25>;
wakeup; wakeup-source;
muic: max77836-muic { muic: max77836-muic {
compatible = "maxim,max77836-muic"; compatible = "maxim,max77836-muic";
...@@ -185,7 +185,7 @@ s2mps14_pmic@66 { ...@@ -185,7 +185,7 @@ s2mps14_pmic@66 {
interrupt-parent = <&gpx0>; interrupt-parent = <&gpx0>;
interrupts = <7 0>; interrupts = <7 0>;
reg = <0x66>; reg = <0x66>;
wakeup; wakeup-source;
s2mps14_osc: clocks { s2mps14_osc: clocks {
compatible = "samsung,s2mps14-clk"; compatible = "samsung,s2mps14-clk";
......
arch/arm/boot/dts/exynos3250-rinato.dts
View file @ 36a0282a
...@@ -43,7 +43,7 @@ power_key { ...@@ -43,7 +43,7 @@ power_key {
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
label = "power key"; label = "power key";
debounce-interval = <10>; debounce-interval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
...@@ -58,7 +58,7 @@ max77836: subpmic@25 { ...@@ -58,7 +58,7 @@ max77836: subpmic@25 {
interrupt-parent = <&gpx1>; interrupt-parent = <&gpx1>;
interrupts = <5 0>; interrupts = <5 0>;
reg = <0x25>; reg = <0x25>;
wakeup; wakeup-source;
muic: max77836-muic { muic: max77836-muic {
compatible = "maxim,max77836-muic"; compatible = "maxim,max77836-muic";
...@@ -246,7 +246,7 @@ s2mps14_pmic@66 { ...@@ -246,7 +246,7 @@ s2mps14_pmic@66 {
interrupt-parent = <&gpx0>; interrupt-parent = <&gpx0>;
interrupts = <7 0>; interrupts = <7 0>;
reg = <0x66>; reg = <0x66>;
wakeup; wakeup-source;
s2mps14_osc: clocks { s2mps14_osc: clocks {
compatible = "samsung,s2mps14-clk"; compatible = "samsung,s2mps14-clk";
......
arch/arm/boot/dts/exynos4210-origen.dts
View file @ 36a0282a
...@@ -60,35 +60,35 @@ up { ...@@ -60,35 +60,35 @@ up {
label = "Up"; label = "Up";
gpios = <&gpx2 0 GPIO_ACTIVE_LOW>; gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
linux,code = <KEY_UP>; linux,code = <KEY_UP>;
gpio-key,wakeup; wakeup-source;
}; };
down { down {
label = "Down"; label = "Down";
gpios = <&gpx2 1 GPIO_ACTIVE_LOW>; gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_DOWN>; linux,code = <KEY_DOWN>;
gpio-key,wakeup; wakeup-source;
}; };
back { back {
label = "Back"; label = "Back";
gpios = <&gpx1 7 GPIO_ACTIVE_LOW>; gpios = <&gpx1 7 GPIO_ACTIVE_LOW>;
linux,code = <KEY_BACK>; linux,code = <KEY_BACK>;
gpio-key,wakeup; wakeup-source;
}; };
home { home {
label = "Home"; label = "Home";
gpios = <&gpx1 6 GPIO_ACTIVE_LOW>; gpios = <&gpx1 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
gpio-key,wakeup; wakeup-source;
}; };
menu { menu {
label = "Menu"; label = "Menu";
gpios = <&gpx1 5 GPIO_ACTIVE_LOW>; gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/exynos4210-smdkv310.dts
View file @ 36a0282a
...@@ -66,7 +66,7 @@ &keypad { ...@@ -66,7 +66,7 @@ &keypad {
samsung,keypad-num-rows = <2>; samsung,keypad-num-rows = <2>;
samsung,keypad-num-columns = <8>; samsung,keypad-num-columns = <8>;
linux,keypad-no-autorepeat; linux,keypad-no-autorepeat;
linux,keypad-wakeup; wakeup-source;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&keypad_rows &keypad_cols>; pinctrl-0 = <&keypad_rows &keypad_cols>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/exynos4210-trats.dts
View file @ 36a0282a
...@@ -112,7 +112,7 @@ power-key { ...@@ -112,7 +112,7 @@ power-key {
linux,code = <116>; linux,code = <116>;
label = "power"; label = "power";
debounce-interval = <10>; debounce-interval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
ok-key { ok-key {
......
arch/arm/boot/dts/exynos4210-universal_c210.dts
View file @ 36a0282a
...@@ -92,7 +92,7 @@ config-key { ...@@ -92,7 +92,7 @@ config-key {
linux,code = <171>; linux,code = <171>;
label = "config"; label = "config";
debounce-interval = <1>; debounce-interval = <1>;
gpio-key,wakeup; wakeup-source;
}; };
camera-key { camera-key {
...@@ -107,7 +107,7 @@ power-key { ...@@ -107,7 +107,7 @@ power-key {
linux,code = <116>; linux,code = <116>;
label = "power"; label = "power";
debounce-interval = <1>; debounce-interval = <1>;
gpio-key,wakeup; wakeup-source;
}; };
ok-key { ok-key {
......
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View file @ 36a0282a
...@@ -35,7 +35,7 @@ power_key { ...@@ -35,7 +35,7 @@ power_key {
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
label = "power key"; label = "power key";
debounce-interval = <10>; debounce-interval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/exynos4412-odroidx.dts
View file @ 36a0282a
...@@ -48,7 +48,7 @@ home_key { ...@@ -48,7 +48,7 @@ home_key {
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
label = "home key"; label = "home key";
debounce-interval = <10>; debounce-interval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/exynos4412-origen.dts
View file @ 36a0282a
...@@ -423,7 +423,7 @@ &keypad { ...@@ -423,7 +423,7 @@ &keypad {
samsung,keypad-num-rows = <3>; samsung,keypad-num-rows = <3>;
samsung,keypad-num-columns = <2>; samsung,keypad-num-columns = <2>;
linux,keypad-no-autorepeat; linux,keypad-no-autorepeat;
linux,keypad-wakeup; wakeup-source;
pinctrl-0 = <&keypad_rows &keypad_cols>; pinctrl-0 = <&keypad_rows &keypad_cols>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
......
arch/arm/boot/dts/exynos4412-smdk4412.dts
View file @ 36a0282a
...@@ -45,7 +45,7 @@ &keypad { ...@@ -45,7 +45,7 @@ &keypad {
samsung,keypad-num-rows = <3>; samsung,keypad-num-rows = <3>;
samsung,keypad-num-columns = <8>; samsung,keypad-num-columns = <8>;
linux,keypad-no-autorepeat; linux,keypad-no-autorepeat;
linux,keypad-wakeup; wakeup-source;
pinctrl-0 = <&keypad_rows &keypad_cols>; pinctrl-0 = <&keypad_rows &keypad_cols>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
......
arch/arm/boot/dts/exynos4412-trats2.dts
View file @ 36a0282a
...@@ -119,7 +119,7 @@ key-power { ...@@ -119,7 +119,7 @@ key-power {
linux,code = <116>; linux,code = <116>;
label = "power"; label = "power";
debounce-interval = <10>; debounce-interval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
key-ok { key-ok {
...@@ -127,7 +127,7 @@ key-ok { ...@@ -127,7 +127,7 @@ key-ok {
linux,code = <139>; linux,code = <139>;
label = "ok"; label = "ok";
debounce-inteval = <10>; debounce-inteval = <10>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/exynos5250-arndale.dts
View file @ 36a0282a
...@@ -34,42 +34,42 @@ menu { ...@@ -34,42 +34,42 @@ menu {
label = "SW-TACT2"; label = "SW-TACT2";
gpios = <&gpx1 4 GPIO_ACTIVE_LOW>; gpios = <&gpx1 4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
gpio-key,wakeup; wakeup-source;
}; };
home { home {
label = "SW-TACT3"; label = "SW-TACT3";
gpios = <&gpx1 5 GPIO_ACTIVE_LOW>; gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
gpio-key,wakeup; wakeup-source;
}; };
up { up {
label = "SW-TACT4"; label = "SW-TACT4";
gpios = <&gpx1 6 GPIO_ACTIVE_LOW>; gpios = <&gpx1 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_UP>; linux,code = <KEY_UP>;
gpio-key,wakeup; wakeup-source;
}; };
down { down {
label = "SW-TACT5"; label = "SW-TACT5";
gpios = <&gpx1 7 GPIO_ACTIVE_LOW>; gpios = <&gpx1 7 GPIO_ACTIVE_LOW>;
linux,code = <KEY_DOWN>; linux,code = <KEY_DOWN>;
gpio-key,wakeup; wakeup-source;
}; };
back { back {
label = "SW-TACT6"; label = "SW-TACT6";
gpios = <&gpx2 0 GPIO_ACTIVE_LOW>; gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
linux,code = <KEY_BACK>; linux,code = <KEY_BACK>;
gpio-key,wakeup; wakeup-source;
}; };
wakeup { wakeup {
label = "SW-TACT7"; label = "SW-TACT7";
gpios = <&gpx2 1 GPIO_ACTIVE_LOW>; gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WAKEUP>; linux,code = <KEY_WAKEUP>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/exynos5250-snow-common.dtsi
View file @ 36a0282a
...@@ -37,7 +37,7 @@ power { ...@@ -37,7 +37,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
lid-switch { lid-switch {
...@@ -46,7 +46,7 @@ lid-switch { ...@@ -46,7 +46,7 @@ lid-switch {
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;
}; };
}; };
......
arch/arm/boot/dts/exynos5250-spring.dts
View file @ 36a0282a
...@@ -37,7 +37,7 @@ power { ...@@ -37,7 +37,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
lid-switch { lid-switch {
...@@ -46,7 +46,7 @@ lid-switch { ...@@ -46,7 +46,7 @@ lid-switch {
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;
}; };
}; };
......
arch/arm/boot/dts/exynos5420-arndale-octa.dts
View file @ 36a0282a
...@@ -48,7 +48,7 @@ wakeup { ...@@ -48,7 +48,7 @@ wakeup {
label = "SW-TACT1"; label = "SW-TACT1";
gpios = <&gpx2 7 GPIO_ACTIVE_LOW>; gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WAKEUP>; linux,code = <KEY_WAKEUP>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
......
arch/arm/boot/dts/exynos5420-peach-pit.dts
View file @ 36a0282a
...@@ -65,7 +65,7 @@ power { ...@@ -65,7 +65,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpx1 2 GPIO_ACTIVE_LOW>; gpios = <&gpx1 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
lid-switch { lid-switch {
...@@ -74,7 +74,7 @@ lid-switch { ...@@ -74,7 +74,7 @@ lid-switch {
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;
}; };
}; };
......
arch/arm/boot/dts/exynos5800-peach-pi.dts
View file @ 36a0282a
...@@ -64,7 +64,7 @@ power { ...@@ -64,7 +64,7 @@ power {
label = "Power"; label = "Power";
gpios = <&gpx1 2 GPIO_ACTIVE_LOW>; gpios = <&gpx1 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
lid-switch { lid-switch {
...@@ -73,7 +73,7 @@ lid-switch { ...@@ -73,7 +73,7 @@ lid-switch {
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;
}; };
}; };
......
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