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>,
linux-rockchip@lists.infradead.org,
Heiko Stuebner <heiko@sntech.de>
Subject: [PATCH 07/19] ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source property
Date: Wed, 21 Oct 2015 11:10:04 +0100 [thread overview]
Message-ID: <1445422216-29375-8-git-send-email-sudeep.holla@arm.com> (raw)
In-Reply-To: <1445422216-29375-1-git-send-email-sudeep.holla@arm.com>
Keyboard driver for GPIO buttons(gpio-keys) checks for the legacy
"gpio-key,wakeup" boolean property to enable gpio buttons as wakeup
source.
Few dts files assign value "1" to gpio-key,wakeup and in one instance a
value "0" is assigned probably assuming it won't be enabled as a wakeup
source. Since the presence of the boolean property indicates it is
enabled, value of "0" have no value.
This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property which inturn fixes the above mentioned issue.
Cc: linux-rockchip@lists.infradead.org
Cc: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 3 +--
arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +-
arch/arm/boot/dts/rk3188-radxarock.dts | 2 +-
arch/arm/boot/dts/rk3288-evb.dtsi | 2 +-
arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +-
arch/arm/boot/dts/rk3288-popmetal.dts | 2 +-
arch/arm/boot/dts/rk3288-r89.dts | 2 +-
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 2 +-
arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +-
arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +-
10 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index c0273755431a..93be8f066e6d 100644
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -74,7 +74,7 @@
linux,code = <116>;
label = "GPIO Key Power";
linux,input-type = <1>;
- gpio-key,wakeup = <1>;
+ wakeup-source;
debounce-interval = <100>;
};
button@1 {
@@ -82,7 +82,6 @@
linux,code = <104>;
label = "GPIO Key Vol-";
linux,input-type = <1>;
- gpio-key,wakeup = <0>;
debounce-interval = <100>;
};
/* VOL+ comes somehow thru the ADC */
diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts
index e36383c701dc..da1c37a721c0 100644
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -65,7 +65,7 @@
#size-cells = <0>;
button@0 {
- gpio-key,wakeup = <1>;
+ wakeup-source;
gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
label = "GPIO Power";
linux,code = <116>;
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index d2180e5d2b05..acd3bb940e9a 100644
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -63,7 +63,7 @@
linux,code = <116>;
label = "GPIO Key Power";
linux,input-type = <1>;
- gpio-key,wakeup = <1>;
+ wakeup-source;
debounce-interval = <100>;
};
};
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index f6d2e7894b05..e35cebc69e87 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -103,7 +103,7 @@
linux,code = <116>;
label = "GPIO Key Power";
linux,input-type = <1>;
- gpio-key,wakeup = <1>;
+ wakeup-source;
debounce-interval = <100>;
};
};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 20fa0ef0b96b..c5dd26139b63 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -67,7 +67,7 @@
#size-cells = <0>;
button@0 {
- gpio-key,wakeup = <1>;
+ wakeup-source;
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
label = "GPIO Power";
linux,code = <116>;
diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index f82b956ebf17..34a0b063b3ec 100644
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -74,7 +74,7 @@
linux,code = <116>;
label = "GPIO Key Power";
linux,input-type = <1>;
- gpio-key,wakeup = <1>;
+ wakeup-source;
debounce-interval = <100>;
};
};
diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index 14b9fc73c8a4..dc2f83a38d4f 100644
--- a/arch/arm/boot/dts/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rk3288-r89.dts
@@ -73,7 +73,7 @@
linux,code = <116>;
label = "GPIO Key Power";
linux,input-type = <1>;
- gpio-key,wakeup = <1>;
+ wakeup-source;
debounce-interval = <100>;
};
};
diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
index 136d650dd05f..610769d99522 100644
--- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
@@ -108,7 +108,7 @@
lid {
label = "Lid";
gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
- gpio-key,wakeup;
+ wakeup-source;
linux,code = <0>; /* SW_LID */
linux,input-type = <5>; /* EV_SW */
debounce-interval = <1>;
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 275c78ccc0f3..914c299f9dda 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -64,7 +64,7 @@
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
debounce-interval = <100>;
- gpio-key,wakeup;
+ wakeup-source;
};
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 401a81231eb9..730bac3a1c0a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@ -71,7 +71,7 @@
pinctrl-0 = <&pwr_key>;
button@0 {
- gpio-key,wakeup = <1>;
+ wakeup-source;
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
label = "GPIO Power";
linux,code = <116>;
--
1.9.1
next prev parent reply other threads:[~2015-10-21 10:15 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 ` Sudeep Holla [this message]
2015-10-21 10:10 ` [PATCH 08/19] ARM: dts: spear: replace gpio-key,wakeup with wakeup-source property 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 ` [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property Sudeep Holla
2015-10-21 10:18 ` 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-8-git-send-email-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
/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).