Skip to contentSkip to conversation

ARM: dts: rockchip: replace gpio-key, wakeup with wakeup-source property

PATCH New Sudeep Holla 2 participants 3 messages Feb 8, 2016 – Feb 10, 2016

Subsystems (2)
Device tree bindings Arm Rockchip
lore
Share & tools
lore

Sudeep Holla

author
#0 lore raw

PATCH 1/1 ARM: dts: rockchip: replace gpio-key, wakeup with wakeup-source property

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 at lists.infradead.org
Reviewed-by Heiko Stuebner <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
 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-evb.dtsi    | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts     | 2 +-
 11 files changed, 11 insertions(+), 12 deletions(-)

Hi Heiko,

You can reviewed this, however there are couple of ARM64 dts additions. Also most of the other platform/SoC maintainers preferred to take it via their tree and few of these got missed during v4.5 merge window. Can you take it via your tree for v4.6 ?

Regards,
Sudeep

arch/arm/boot/dts/rk3066a-bqcurie2.dts +1 -2
index 38c91a839795..f92b46b7a6de 100644
@@ -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 at 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 */
arch/arm/boot/dts/rk3066a-rayeager.dts +1 -1
index 341c1f87936a..3a493e407607 100644
@@ -65,7 +65,7 @@
 		#size-cells = <0>;
 
 		button at 0 {
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 			gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
 			label = "GPIO Power";
 			linux,code = <116>;
arch/arm/boot/dts/rk3188-radxarock.dts +1 -1
index 66fa87d1e2c2..0b6924c97b6b 100644
@@ -63,7 +63,7 @@
 			linux,code = <116>;
 			label = "GPIO Key Power";
 			linux,input-type = <1>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 			debounce-interval = <100>;
 		};
 	};
arch/arm/boot/dts/rk3288-evb.dtsi +1 -1
index 4faabdb65868..78d47f7d2938 100644
@@ -110,7 +110,7 @@
 			linux,code = <116>;
 			label = "GPIO Key Power";
 			linux,input-type = <1>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 			debounce-interval = <100>;
 		};
 	};
arch/arm/boot/dts/rk3288-firefly.dtsi +1 -1
index 4e3fd9aefe34..792ca4f2ebee 100644
@@ -91,7 +91,7 @@
 		#size-cells = <0>;
 
 		button at 0 {
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
 			label = "GPIO Power";
 			linux,code = <116>;
arch/arm/boot/dts/rk3288-popmetal.dts +1 -1
index 65c475642d5a..2ff9689d2e1b 100644
@@ -74,7 +74,7 @@
 			linux,code = <116>;
 			label = "GPIO Key Power";
 			linux,input-type = <1>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 			debounce-interval = <100>;
 		};
 	};
arch/arm/boot/dts/rk3288-r89.dts +1 -1
index 17f13c73fe5e..510a1d0d7abb 100644
@@ -73,7 +73,7 @@
 			linux,code = <116>;
 			label = "GPIO Key Power";
 			linux,input-type = <1>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 			debounce-interval = <100>;
 		};
 	};
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi +1 -1
index 136d650dd05f..610769d99522 100644
@@ -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>;
arch/arm/boot/dts/rk3288-veyron.dtsi +1 -1
index 9fce91ffff6f..420ba9b436a5 100644
@@ -64,7 +64,7 @@
 			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
 			debounce-interval = <100>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi +1 -1
index 8c219ccf67a3..6e27b22704df 100644
@@ -111,7 +111,7 @@
 		pinctrl-0 = <&pwr_key>;
 
 		button at 0 {
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
 			label = "GPIO Power";
 			linux,code = <116>;
arch/arm64/boot/dts/rockchip/rk3368-r88.dts +1 -1
index 104cbee762bb..1f2b642e794a 100644
@@ -71,7 +71,7 @@
 		pinctrl-0 = <&pwr_key>;
 
 		button at 0 {
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
 			label = "GPIO Power";
 			linux,code = <116>;
Signature · 1 line
1.9.1
maintainer
#1 lore raw

PATCH 1/1 ARM: dts: rockchip: replace gpio-key, wakeup with wakeup-source property

Hi Sudeep,

Am Montag, 8. Februar 2016, 21:55:12 schrieb Sudeep Holla:

Quoted 29 lines

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 at lists.infradead.org
Reviewed-by Heiko Stuebner <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
 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-evb.dtsi    | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts     | 2 +-
 11 files changed, 11 insertions(+), 12 deletions(-)
Quoted 6 lines

Hi Heiko,

You can reviewed this, however there are couple of ARM64 dts additions. Also most of the other platform/SoC maintainers preferred to take it via their tree and few of these got missed during v4.5 merge window. Can you take it via your tree for v4.6 ?

I've split the patch in two, as the 32 and 64 bit devicetree parts go through separate branches and applied both to their respective branches for v4.6

Heiko

author
#2 lore raw

PATCH 1/1 ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source property

Quoted 3 lines · Heiko Stuebner

Hi Sudeep,

Am Montag, 8. Februar 2016, 21:55:12 schrieb Sudeep Holla:

[..]

Quoted 10 lines
Quoted 6 lines

Hi Heiko,

You can reviewed this, however there are couple of ARM64 dts additions. Also most of the other platform/SoC maintainers preferred to take it via their tree and few of these got missed during v4.5 merge window. Can you take it via your tree for v4.6 ?

I've split the patch in two, as the 32 and 64 bit devicetree parts go through separate branches and applied both to their respective branches for v4.6

Thanks for splitting up the patch yourself.

Signature · 2 lines
Regards,
Sudeep