Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1252689
| From | Sudeep Holla <sudeep.holla@arm.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 07/19] ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source property |
| Date | 2015-10-21 12:20 +0200 |
| Message-ID | <qlYEX-8lO-53@gated-at.bofh.it> (permalink) |
| References | <qlYEV-8lO-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/19] devicetree: standardize/consolidate on "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 15/19] ARM: dts: omap: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 05/19] mmc: core/host: enable support for the standard "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 11/19] ARM: dts: imx: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 16/19] ARM: dts: s5pv210: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 17/19] ARM: dts: armada: replace isil,irq2-can-wakeup-machine with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties Rob Herring <robh+dt@kernel.org> - 2015-10-22 00:10 +0200
Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties Sudeep Holla <sudeep.holla@arm.com> - 2015-10-28 19:30 +0100
Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties Rob Herring <robh+dt@kernel.org> - 2015-10-30 19:40 +0100
[PATCH 08/19] ARM: dts: spear: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 04/19] rtc: isl12057: enable support for the standard "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
Re: [PATCH 04/19] rtc: isl12057: enable support for the standard "wakeup-source" property Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-10-28 00:00 +0100
[PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
Re: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source Linus Walleij <linus.walleij@linaro.org> - 2015-10-27 13:40 +0100
Re: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-27 13:50 +0100
Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property Geert Uytterhoeven <geert@linux-m68k.org> - 2015-10-21 12:20 +0200
Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:30 +0200
Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property Simon Horman <horms@verge.net.au> - 2015-10-22 03:00 +0200
Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-22 11:40 +0200
Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property Simon Horman <horms@verge.net.au> - 2015-10-23 02:20 +0200
[PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 09/19] ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 07/19] ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 12/19] ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
[PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2015-10-23 08:40 +0200
Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-23 12:30 +0200
Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2015-10-26 09:40 +0100
[PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property Nicolas Ferre <nicolas.ferre@atmel.com> - 2015-10-21 12:30 +0200
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:30 +0200
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property Ulf Hansson <ulf.hansson@linaro.org> - 2015-10-21 13:10 +0200
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 13:20 +0200
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 14:50 +0200
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property Nicolas Ferre <nicolas.ferre@atmel.com> - 2015-10-21 17:30 +0200
[PATCH 13/19] ARM: dts: tegra: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
csiph-web