diff options
| author | Sudeep Holla <sudeep.holla@arm.com> | 2016-02-08 22:55:53 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-02-11 01:23:58 +0100 |
| commit | a5b87513119248c87b9df938025d066af8ec8856 (patch) | |
| tree | 66258ecb6bae141f247d2b2e40d0d2efb8fe39fa /arch | |
| parent | ARM: OMAP2+: Set system_rev from ATAGS for n900 (diff) | |
| download | linux-a5b87513119248c87b9df938025d066af8ec8856.tar.xz linux-a5b87513119248c87b9df938025d066af8ec8856.zip | |
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>
Diffstat (limited to 'arch')
| -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 @@ gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>; linux,code = <KEY_BACK>; debounce-interval = <1000>; - gpio-key,wakeup; + wakeup-source; }; front_button { @@ -54,7 +54,7 @@ gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>; linux,code = <KEY_FRONT>; debounce-interval = <1000>; - gpio-key,wakeup; + wakeup-source; }; }; 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 @@ ti,debounce-tol = /bits/ 16 <10>; ti,debounce-rep = /bits/ 16 <1>; - linux,wakeup; + wakeup-source; }; }; |