diff options
author | Sudeep Holla <sudeep.holla@arm.com> | 2016-02-08 16:55:53 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-02-10 19:23:58 -0500 |
commit | a5b87513119248c87b9df938025d066af8ec8856 (patch) | |
tree | 66258ecb6bae141f247d2b2e40d0d2efb8fe39fa | |
parent | 5f35dc47c1744110d4119c4aa2a00872e8a1217b (diff) |
ARM: dts: am335x/am57xx: replace gpio-key,wakeup with wakeup-source property
Commit 3efda00129bd ("ARM: dts: am335x: replace gpio-key,wakeup with
wakeup-source property") replaces all the legacy "gpio-key,wakeup" with
the unified "wakeup-source" property to prevent any further copy-paste
duplication.
However couple of use of these legacy property sneaked in during the
merge window. This patch replaces them too.
Cc: "BenoƮt Cousson" <bcousson@baylibre.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/am335x-shc.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts index 1b5b044fcd91..865de8500f1c 100644 --- a/arch/arm/boot/dts/am335x-shc.dts +++ b/arch/arm/boot/dts/am335x-shc.dts | |||
@@ -46,7 +46,7 @@ | |||
46 | gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>; | 46 | gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>; |
47 | linux,code = <KEY_BACK>; | 47 | linux,code = <KEY_BACK>; |
48 | debounce-interval = <1000>; | 48 | debounce-interval = <1000>; |
49 | gpio-key,wakeup; | 49 | wakeup-source; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | front_button { | 52 | front_button { |
@@ -54,7 +54,7 @@ | |||
54 | gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>; | 54 | gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>; |
55 | linux,code = <KEY_FRONT>; | 55 | linux,code = <KEY_FRONT>; |
56 | debounce-interval = <1000>; | 56 | debounce-interval = <1000>; |
57 | gpio-key,wakeup; | 57 | wakeup-source; |
58 | }; | 58 | }; |
59 | }; | 59 | }; |
60 | 60 | ||
diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 8d93882dc8d5..1c06cb76da07 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts | |||
@@ -545,7 +545,7 @@ | |||
545 | ti,debounce-tol = /bits/ 16 <10>; | 545 | ti,debounce-tol = /bits/ 16 <10>; |
546 | ti,debounce-rep = /bits/ 16 <1>; | 546 | ti,debounce-rep = /bits/ 16 <1>; |
547 | 547 | ||
548 | linux,wakeup; | 548 | wakeup-source; |
549 | }; | 549 | }; |
550 | }; | 550 | }; |
551 | 551 | ||