From: Sudeep Holla <sudeep.holla@arm.com>
To: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Simon Horman <horms@verge.net.au>,
Magnus Damm <magnus.damm@gmail.com>,
linux-sh@vger.kernel.org
Subject: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Date: Wed, 21 Oct 2015 11:10:11 +0100 [thread overview]
Message-ID: <1445422216-29375-15-git-send-email-sudeep.holla@arm.com> (raw)
In-Reply-To: <1445422216-29375-1-git-send-email-sudeep.holla@arm.com>
Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
check for/support the legacy "gpio-key,wakeup" boolean property to
enable gpio buttons as wakeup source, "wakeup-source" is the new
standard binding.
This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +-
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
arch/arm/boot/dts/r8a7790-lager.dts | 8 ++++----
arch/arm/boot/dts/r8a7791-koelsch.dts | 22 +++++++++++-----------
arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
index a4c425923c05..9b7eabd3eba3 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
@@ -110,7 +110,7 @@
gpios = <&pfc 324 GPIO_ACTIVE_LOW>;
linux,code = <KEY_0>;
label = "S16";
- gpio-key,wakeup;
+ wakeup-source;
};
menu-key {
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index 105d9c95de4a..78a21f2828df 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -85,7 +85,7 @@
gpios = <&pfc 99 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
label = "SW3";
- gpio-key,wakeup;
+ wakeup-source;
};
back-key {
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 37dec5269491..8523c3d03de3 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -77,28 +77,28 @@
button@1 {
linux,code = <KEY_1>;
label = "SW2-1";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
};
button@2 {
linux,code = <KEY_2>;
label = "SW2-2";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
};
button@3 {
linux,code = <KEY_3>;
label = "SW2-3";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;
};
button@4 {
linux,code = <KEY_4>;
label = "SW2-4";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
};
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index dc158845afdc..48cddfc25f72 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -79,77 +79,77 @@
gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
linux,code = <KEY_1>;
label = "SW2-1";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-2 {
gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_2>;
label = "SW2-2";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-3 {
gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_3>;
label = "SW2-3";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-4 {
gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_4>;
label = "SW2-4";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-a {
gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
linux,code = <KEY_A>;
label = "SW30";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-b {
gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_B>;
label = "SW31";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-c {
gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_C>;
label = "SW32";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-d {
gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_D>;
label = "SW33";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-e {
gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_E>;
label = "SW34";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-f {
gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_F>;
label = "SW35";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
key-g {
gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_G>;
label = "SW36";
- gpio-key,wakeup;
+ wakeup-source;
debounce-interval = <20>;
};
};
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
index 24b4cd24dceb..710ea035d0f4 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -147,7 +147,7 @@
gpios = <&pcf8575 14 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>;
label = "SW1";
- gpio-key,wakeup;
+ wakeup-source;
};
};
--
1.9.1
next prev parent reply other threads:[~2015-10-21 10:13 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-21 10:09 [PATCH 00/19] devicetree: standardize/consolidate on "wakeup-source" property Sudeep Holla
2015-10-21 10:09 ` [PATCH 01/19] Documentation: " Sudeep Holla
2015-10-21 22:02 ` Rob Herring
2015-10-21 10:09 ` [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties Sudeep Holla
2015-10-21 22:04 ` Rob Herring
2015-10-28 18:23 ` Sudeep Holla
2015-10-30 18:29 ` Rob Herring
2015-10-21 10:10 ` [PATCH 03/19] rtc: opal: enable support for the stardard "wakeup-source" property Sudeep Holla
2015-10-27 22:53 ` Alexandre Belloni
2015-10-21 10:10 ` [PATCH 04/19] rtc: isl12057: enable support for the standard " Sudeep Holla
2015-10-27 22:53 ` Alexandre Belloni
2015-10-21 10:10 ` [PATCH 05/19] mmc: core/host: " Sudeep Holla
2015-11-19 11:32 ` Ulf Hansson
2015-10-21 10:10 ` [PATCH 06/19] input: tegra-kbc: " Sudeep Holla
2015-10-23 6:39 ` Dmitry Torokhov
2015-10-23 10:23 ` Sudeep Holla
2015-10-26 8:33 ` Dmitry Torokhov
2015-10-21 10:10 ` [PATCH 07/19] ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source property Sudeep Holla
2015-10-21 10:10 ` [PATCH 08/19] ARM: dts: spear: " Sudeep Holla
2015-10-21 10:10 ` [PATCH 09/19] ARM: dts: am335x: " Sudeep Holla
2015-12-15 16:33 ` Sudeep Holla
2015-12-17 17:58 ` Tony Lindgren
2015-10-21 10:10 ` [PATCH 10/19] ARM: dts: at91: " Sudeep Holla
2015-10-21 10:21 ` Nicolas Ferre
2015-10-21 10:25 ` Sudeep Holla
2015-10-21 11:01 ` Ulf Hansson
2015-10-21 11:13 ` Sudeep Holla
2015-10-21 12:41 ` Sudeep Holla
2015-10-21 15:27 ` Nicolas Ferre
2015-10-21 10:10 ` [PATCH 11/19] ARM: dts: imx: replace legacy *,wakeup property with wakeup-source Sudeep Holla
2015-11-23 5:37 ` Shawn Guo
2015-11-26 11:33 ` Sudeep Holla
2015-12-02 1:54 ` Shawn Guo
2015-12-02 10:05 ` Sudeep Holla
2015-10-21 10:10 ` [PATCH 12/19] ARM: dts: exynos: " Sudeep Holla
2015-12-15 16:35 ` Sudeep Holla
2015-12-15 23:32 ` Krzysztof Kozlowski
2015-12-16 10:32 ` Sudeep Holla
2015-12-16 23:38 ` Krzysztof Kozlowski
2015-12-16 23:49 ` Krzysztof Kozlowski
2016-01-28 8:11 ` Krzysztof Kozlowski
2016-01-28 15:59 ` [UPDATE] " Sudeep Holla
2016-01-29 0:11 ` Krzysztof Kozlowski
2015-10-21 10:10 ` [PATCH 13/19] ARM: dts: tegra: " Sudeep Holla
2015-12-15 16:35 ` Sudeep Holla
2015-12-23 11:24 ` Sudeep Holla
2015-10-21 10:10 ` Sudeep Holla [this message]
2015-10-21 10:18 ` [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property Geert Uytterhoeven
2015-10-21 10:23 ` Sudeep Holla
2015-10-22 0:50 ` Simon Horman
2015-10-22 9:37 ` Sudeep Holla
2015-10-23 0:18 ` Simon Horman
2015-10-21 10:10 ` [PATCH 15/19] ARM: dts: omap: replace legacy *,wakeup property with wakeup-source Sudeep Holla
2015-12-15 16:37 ` Sudeep Holla
2015-12-17 17:58 ` Tony Lindgren
2015-10-21 10:10 ` [PATCH 16/19] ARM: dts: s5pv210: " Sudeep Holla
2015-12-15 16:37 ` Sudeep Holla
2015-12-16 23:52 ` Krzysztof Kozlowski
2015-10-21 10:10 ` [PATCH 17/19] ARM: dts: armada: replace isil,irq2-can-wakeup-machine with wakeup-source property Sudeep Holla
2015-12-15 16:39 ` Sudeep Holla
2015-12-15 16:56 ` Gregory CLEMENT
2015-10-21 10:10 ` [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source Sudeep Holla
2015-10-27 12:34 ` Linus Walleij
2015-10-27 12:46 ` Sudeep Holla
2015-11-05 9:26 ` Linus Walleij
2015-10-21 10:10 ` [PATCH 19/19] ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property Sudeep Holla
2015-10-29 8:56 ` Michal Simek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445422216-29375-15-git-send-email-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).