Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1245715 > unrolled thread

[PATCH 1/2] ARM: dts: fix gpio-keys wakeup-source property

Started bySudeep Holla <sudeep.holla@arm.com>
First post2015-10-13 15:40 +0200
Last post2015-10-15 17:30 +0200
Articles 12 — 6 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/2] ARM: dts: fix gpio-keys wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-13 15:40 +0200
    [PATCH 2/2] ARM: dts: change gpio-key,wakeup property to boolean Sudeep Holla <sudeep.holla@arm.com> - 2015-10-13 15:40 +0200
      Re: [PATCH 2/2] ARM: dts: change gpio-key,wakeup property to boolean Rob Herring <robh@kernel.org> - 2015-10-13 16:10 +0200
        Re: [PATCH 2/2] ARM: dts: change gpio-key,wakeup property to boolean Sudeep Holla <sudeep.holla@arm.com> - 2015-10-13 16:30 +0200
      [PATCH 2/2][UPDATE] ARM: dts: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-13 16:40 +0200
        Re: [PATCH 2/2][UPDATE] ARM: dts: replace gpio-key,wakeup with  wakeup-source property Viresh Kumar <viresh.kumar@linaro.org> - 2015-10-13 17:10 +0200
        Re: [PATCH 2/2][UPDATE] ARM: dts: replace gpio-key,wakeup with wakeup-source property Heiko Stübner <heiko@sntech.de> - 2015-10-13 20:00 +0200
    Re: [PATCH 1/2] ARM: dts: fix gpio-keys wakeup-source property Simon Horman <horms@verge.net.au> - 2015-10-14 02:20 +0200
      Re: [PATCH 1/2] ARM: dts: fix gpio-keys wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-14 11:10 +0200
    Re: [PATCH 1/2] ARM: dts: fix gpio-keys wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-14 17:30 +0200
    Re: [PATCH 1/2] ARM: dts: fix gpio-keys wakeup-source property Linus Walleij <linus.walleij@linaro.org> - 2015-10-15 17:00 +0200
      Re: [PATCH 1/2] ARM: dts: fix gpio-keys wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-15 17:30 +0200

#1245715 — [PATCH 1/2] ARM: dts: fix gpio-keys wakeup-source property

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-13 15:40 +0200
Subject[PATCH 1/2] ARM: dts: fix gpio-keys wakeup-source property
Message-ID<qj7Y5-819-5@gated-at.bofh.it>
The keyboard driver for GPIO buttons(gpio-keys) checks for one of the
two boolean properties to enable gpio buttons as wakeup source:
1. "wakeup-source" or
2. the legacy "gpio-key,wakeup"

However juno, ste-snowball and emev2-kzm9d dts file have a undetected
"wakeup" property to indictate the wakeup source.

This patch fixes it by making use of "wakeup-source" property.

Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm/boot/dts/emev2-kzm9d.dts             |  8 ++++----
 arch/arm/boot/dts/ste-snowball.dts            | 10 +++++-----
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index 955c24ee4a8c..8c24975e8f9d 100644
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -35,28 +35,28 @@
 
 		button@1 {
 			debounce_interval = <50>;
-			wakeup = <1>;
+			wakeup-source;
 			label = "DSW2-1";
 			linux,code = <KEY_1>;
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 		};
 		button@2 {
 			debounce_interval = <50>;
-			wakeup = <1>;
+			wakeup-source;
 			label = "DSW2-2";
 			linux,code = <KEY_2>;
 			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
 		};
 		button@3 {
 			debounce_interval = <50>;
-			wakeup = <1>;
+			wakeup-source;
 			label = "DSW2-3";
 			linux,code = <KEY_3>;
 			gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
 		};
 		button@4 {
 			debounce_interval = <50>;
-			wakeup = <1>;
+			wakeup-source;
 			label = "DSW2-4";
 			linux,code = <KEY_4>;
 			gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 32a5ccb14e7e..e80e42163883 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -47,35 +47,35 @@
 
 		button@1 {
 			debounce_interval = <50>;
-			wakeup = <1>;
+			wakeup-source;
 			linux,code = <2>;
 			label = "userpb";
 			gpios = <&gpio1 0 0x4>;
 		};
 		button@2 {
 			debounce_interval = <50>;
-			wakeup = <1>;
+			wakeup-source;
 			linux,code = <3>;
 			label = "extkb1";
 			gpios = <&gpio4 23 0x4>;
 		};
 		button@3 {
 			debounce_interval = <50>;
-			wakeup = <1>;
+			wakeup-source;
 			linux,code = <4>;
 			label = "extkb2";
 			gpios = <&gpio4 24 0x4>;
 		};
 		button@4 {
 			debounce_interval = <50>;
-			wakeup = <1>;
+			wakeup-source;
 			linux,code = <5>;
 			label = "extkb3";
 			gpios = <&gpio5 1 0x4>;
 		};
 		button@5 {
 			debounce_interval = <50>;
-			wakeup = <1>;
+			wakeup-source;
 			linux,code = <6>;
 			label = "extkb4";
 			gpios = <&gpio5 2 0x4>;
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 05e461dc6c1f..a15e1fb4d192 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -61,42 +61,42 @@
 
 				button@1 {
 					debounce_interval = <50>;
-					wakeup = <1>;
+					wakeup-source;
 					linux,code = <116>;
 					label = "POWER";
 					gpios = <&iofpga_gpio0 0 0x4>;
 				};
 				button@2 {
 					debounce_interval = <50>;
-					wakeup = <1>;
+					wakeup-source;
 					linux,code = <102>;
 					label = "HOME";
 					gpios = <&iofpga_gpio0 1 0x4>;
 				};
 				button@3 {
 					debounce_interval = <50>;
-					wakeup = <1>;
+					wakeup-source;
 					linux,code = <152>;
 					label = "RLOCK";
 					gpios = <&iofpga_gpio0 2 0x4>;
 				};
 				button@4 {
 					debounce_interval = <50>;
-					wakeup = <1>;
+					wakeup-source;
 					linux,code = <115>;
 					label = "VOL+";
 					gpios = <&iofpga_gpio0 3 0x4>;
 				};
 				button@5 {
 					debounce_interval = <50>;
-					wakeup = <1>;
+					wakeup-source;
 					linux,code = <114>;
 					label = "VOL-";
 					gpios = <&iofpga_gpio0 4 0x4>;
 				};
 				button@6 {
 					debounce_interval = <50>;
-					wakeup = <1>;
+					wakeup-source;
 					linux,code = <99>;
 					label = "NMI";
 					gpios = <&iofpga_gpio0 5 0x4>;
-- 
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/

[toc] | [next] | [standalone]

#1245718 — [PATCH 2/2] ARM: dts: change gpio-key,wakeup property to boolean

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-13 15:40 +0200
Subject[PATCH 2/2] ARM: dts: change gpio-key,wakeup property to boolean
Message-ID<qj7Y6-819-19@gated-at.bofh.it>
In reply to#1245715
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 removes the property where value "0" is assigned and removes
the value "1" in most of the other cases.

Cc: Heiko Stuebner <heiko@sntech.de>
Cc: linux-rockchip@lists.infradead.org
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: spear-devel@list.st.com
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/spear1310-evb.dts         | 2 +-
 arch/arm/boot/dts/spear1340-evb.dts         | 2 +-
 arch/arm/boot/dts/spear320-hmi.dts          | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +-
 11 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index c0273755431a..71a15772cda6 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>;
+			gpio-key,wakeup;
 			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..72bf52a04506 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>;
+			gpio-key,wakeup;
 			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..ba6b174777e7 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>;
+			gpio-key,wakeup;
 			debounce-interval = <100>;
 		};
 	};
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index f6d2e7894b05..ab013155f04f 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>;
+			gpio-key,wakeup;
 			debounce-interval = <100>;
 		};
 	};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 20fa0ef0b96b..4fa2dedd0c7a 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>;
+			gpio-key,wakeup;
 			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..9b7f389c38e5 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>;
+			gpio-key,wakeup;
 			debounce-interval = <100>;
 		};
 	};
diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index 14b9fc73c8a4..2ee425523f5c 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>;
+			gpio-key,wakeup;
 			debounce-interval = <100>;
 		};
 	};
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index e48857249ce7..6673d74ab0c0 100644
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -161,7 +161,7 @@
 				linux,code = <0x100>;
 				gpios = <&gpio0 7 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				gpio-key,wakeup;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index c611f5606dfe..9071344fa47c 100644
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -223,7 +223,7 @@
 				linux,code = <0x100>;
 				gpios = <&gpio1 1 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				gpio-key,wakeup;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts
index 0aa6fef5ce22..3c5b28c0fce4 100644
--- a/arch/arm/boot/dts/spear320-hmi.dts
+++ b/arch/arm/boot/dts/spear320-hmi.dts
@@ -141,7 +141,7 @@
 				linux,code = <0x100>;
 				gpios = <&stmpegpio 3 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				gpio-key,wakeup;
 			};
 
 			button@2 {
@@ -149,7 +149,7 @@
 				linux,code = <0x200>;
 				gpios = <&stmpegpio 2 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				gpio-key,wakeup;
 			};
 		};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 401a81231eb9..58a2829d9ea7 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>;
+			gpio-key,wakeup;
 			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/

[toc] | [prev] | [next] | [standalone]

#1245764 — Re: [PATCH 2/2] ARM: dts: change gpio-key,wakeup property to boolean

FromRob Herring <robh@kernel.org>
Date2015-10-13 16:10 +0200
SubjectRe: [PATCH 2/2] ARM: dts: change gpio-key,wakeup property to boolean
Message-ID<qj8r9-ok-49@gated-at.bofh.it>
In reply to#1245718
On Tue, Oct 13, 2015 at 8:32 AM, Sudeep Holla <sudeep.holla@arm.com> wrote:
> 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 removes the property where value "0" is assigned and removes
> the value "1" in most of the other cases.

Why don't you just change everything to wakeup-source.

Rob

>
> Cc: Heiko Stuebner <heiko@sntech.de>
> Cc: linux-rockchip@lists.infradead.org
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: spear-devel@list.st.com
> 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/spear1310-evb.dts         | 2 +-
>  arch/arm/boot/dts/spear1340-evb.dts         | 2 +-
>  arch/arm/boot/dts/spear320-hmi.dts          | 4 ++--
>  arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +-
>  11 files changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> index c0273755431a..71a15772cda6 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>;
> +                       gpio-key,wakeup;
>                         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..72bf52a04506 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>;
> +                       gpio-key,wakeup;
>                         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..ba6b174777e7 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>;
> +                       gpio-key,wakeup;
>                         debounce-interval = <100>;
>                 };
>         };
> diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
> index f6d2e7894b05..ab013155f04f 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>;
> +                       gpio-key,wakeup;
>                         debounce-interval = <100>;
>                 };
>         };
> diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
> index 20fa0ef0b96b..4fa2dedd0c7a 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>;
> +                       gpio-key,wakeup;
>                         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..9b7f389c38e5 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>;
> +                       gpio-key,wakeup;
>                         debounce-interval = <100>;
>                 };
>         };
> diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
> index 14b9fc73c8a4..2ee425523f5c 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>;
> +                       gpio-key,wakeup;
>                         debounce-interval = <100>;
>                 };
>         };
> diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
> index e48857249ce7..6673d74ab0c0 100644
> --- a/arch/arm/boot/dts/spear1310-evb.dts
> +++ b/arch/arm/boot/dts/spear1310-evb.dts
> @@ -161,7 +161,7 @@
>                                 linux,code = <0x100>;
>                                 gpios = <&gpio0 7 0x4>;
>                                 debounce-interval = <20>;
> -                               gpio-key,wakeup = <1>;
> +                               gpio-key,wakeup;
>                         };
>                 };
>
> diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
> index c611f5606dfe..9071344fa47c 100644
> --- a/arch/arm/boot/dts/spear1340-evb.dts
> +++ b/arch/arm/boot/dts/spear1340-evb.dts
> @@ -223,7 +223,7 @@
>                                 linux,code = <0x100>;
>                                 gpios = <&gpio1 1 0x4>;
>                                 debounce-interval = <20>;
> -                               gpio-key,wakeup = <1>;
> +                               gpio-key,wakeup;
>                         };
>                 };
>
> diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts
> index 0aa6fef5ce22..3c5b28c0fce4 100644
> --- a/arch/arm/boot/dts/spear320-hmi.dts
> +++ b/arch/arm/boot/dts/spear320-hmi.dts
> @@ -141,7 +141,7 @@
>                                 linux,code = <0x100>;
>                                 gpios = <&stmpegpio 3 0x4>;
>                                 debounce-interval = <20>;
> -                               gpio-key,wakeup = <1>;
> +                               gpio-key,wakeup;
>                         };
>
>                         button@2 {
> @@ -149,7 +149,7 @@
>                                 linux,code = <0x200>;
>                                 gpios = <&stmpegpio 2 0x4>;
>                                 debounce-interval = <20>;
> -                               gpio-key,wakeup = <1>;
> +                               gpio-key,wakeup;
>                         };
>                 };
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
> index 401a81231eb9..58a2829d9ea7 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>;
> +                       gpio-key,wakeup;
>                         gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
>                         label = "GPIO Power";
>                         linux,code = <116>;
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
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/

[toc] | [prev] | [next] | [standalone]

#1245777 — Re: [PATCH 2/2] ARM: dts: change gpio-key,wakeup property to boolean

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-13 16:30 +0200
SubjectRe: [PATCH 2/2] ARM: dts: change gpio-key,wakeup property to boolean
Message-ID<qj8Ku-KS-5@gated-at.bofh.it>
In reply to#1245764

On 13/10/15 15:07, Rob Herring wrote:
> On Tue, Oct 13, 2015 at 8:32 AM, Sudeep Holla <sudeep.holla@arm.com> wrote:
>> 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 removes the property where value "0" is assigned and removes
>> the value "1" in most of the other cases.
>
> Why don't you just change everything to wakeup-source.
>

Agreed, I wanted to do that but was not sure if that's acceptable.
I will update it, now I know that you are fine with it.

I also plan to find all the variety of bindings we have and fix them
retaining only those which are handled in the current kernel code as
legacy support.

-- 
Regards,
Sudeep
--
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/

[toc] | [prev] | [next] | [standalone]

#1245792 — [PATCH 2/2][UPDATE] ARM: dts: replace gpio-key,wakeup with wakeup-source property

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-13 16:40 +0200
Subject[PATCH 2/2][UPDATE] ARM: dts: replace gpio-key,wakeup with wakeup-source property
Message-ID<qj8Ub-Wq-41@gated-at.bofh.it>
In reply to#1245718
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: Heiko Stuebner <heiko@sntech.de>
Cc: linux-rockchip@lists.infradead.org
Cc: Viresh Kumar <viresh.kumar@linaro.org>
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/spear1310-evb.dts         | 2 +-
 arch/arm/boot/dts/spear1340-evb.dts         | 2 +-
 arch/arm/boot/dts/spear320-hmi.dts          | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +-
 11 files changed, 12 insertions(+), 13 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/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index e48857249ce7..84101e4eebbf 100644
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -161,7 +161,7 @@
 				linux,code = <0x100>;
 				gpios = <&gpio0 7 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				wakeup-source;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index c611f5606dfe..6565f3cb866f 100644
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -223,7 +223,7 @@
 				linux,code = <0x100>;
 				gpios = <&gpio1 1 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				wakeup-source;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts
index 0aa6fef5ce22..0d0da1f65f0e 100644
--- a/arch/arm/boot/dts/spear320-hmi.dts
+++ b/arch/arm/boot/dts/spear320-hmi.dts
@@ -141,7 +141,7 @@
 				linux,code = <0x100>;
 				gpios = <&stmpegpio 3 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				wakeup-source;
 			};
 
 			button@2 {
@@ -149,7 +149,7 @@
 				linux,code = <0x200>;
 				gpios = <&stmpegpio 2 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				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/

[toc] | [prev] | [next] | [standalone]

#1245829 — Re: [PATCH 2/2][UPDATE] ARM: dts: replace gpio-key,wakeup with wakeup-source property

FromViresh Kumar <viresh.kumar@linaro.org>
Date2015-10-13 17:10 +0200
SubjectRe: [PATCH 2/2][UPDATE] ARM: dts: replace gpio-key,wakeup with wakeup-source property
Message-ID<qj9nc-1L9-23@gated-at.bofh.it>
In reply to#1245792
On 13-10-15, 15:38, Sudeep Holla wrote:
> 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: Heiko Stuebner <heiko@sntech.de>
> Cc: linux-rockchip@lists.infradead.org
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm/boot/dts/spear1310-evb.dts         | 2 +-
>  arch/arm/boot/dts/spear1340-evb.dts         | 2 +-
>  arch/arm/boot/dts/spear320-hmi.dts          | 4 ++--

Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh
--
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/

[toc] | [prev] | [next] | [standalone]

#1245987 — Re: [PATCH 2/2][UPDATE] ARM: dts: replace gpio-key,wakeup with wakeup-source property

FromHeiko Stübner <heiko@sntech.de>
Date2015-10-13 20:00 +0200
SubjectRe: [PATCH 2/2][UPDATE] ARM: dts: replace gpio-key,wakeup with wakeup-source property
Message-ID<qjc1I-5sd-15@gated-at.bofh.it>
In reply to#1245792
Am Dienstag, 13. Oktober 2015, 15:38:53 schrieb Sudeep Holla:
> 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: Heiko Stuebner <heiko@sntech.de>
> Cc: linux-rockchip@lists.infradead.org
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> 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/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +-

Reviewed-by: Heiko Stuebner <heiko@sntech.de>

--
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/

[toc] | [prev] | [next] | [standalone]

#1246223

FromSimon Horman <horms@verge.net.au>
Date2015-10-14 02:20 +0200
Message-ID<qjhXs-5Ve-5@gated-at.bofh.it>
In reply to#1245715
[cc linux-sh]

On Tue, Oct 13, 2015 at 02:32:43PM +0100, Sudeep Holla wrote:
> The keyboard driver for GPIO buttons(gpio-keys) checks for one of the
> two boolean properties to enable gpio buttons as wakeup source:
> 1. "wakeup-source" or
> 2. the legacy "gpio-key,wakeup"
> 
> However juno, ste-snowball and emev2-kzm9d dts file have a undetected
> "wakeup" property to indictate the wakeup source.
> 
> This patch fixes it by making use of "wakeup-source" property.
> 
> Cc: Simon Horman <horms@verge.net.au>
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm/boot/dts/emev2-kzm9d.dts             |  8 ++++----
>  arch/arm/boot/dts/ste-snowball.dts            | 10 +++++-----
>  arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 12 ++++++------
>  3 files changed, 15 insertions(+), 15 deletions(-)

emev2-kzm9d portion:

Acked-by: Simon Horman <horms+renesas@verge.net.au>

My preferred course of action would be to take that portion through the
renesas tree if it was broken out into a separate patch. But I won't
object if someone wants to take the whole patch/series.

> diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
> index 955c24ee4a8c..8c24975e8f9d 100644
> --- a/arch/arm/boot/dts/emev2-kzm9d.dts
> +++ b/arch/arm/boot/dts/emev2-kzm9d.dts
> @@ -35,28 +35,28 @@
>  
>  		button@1 {
>  			debounce_interval = <50>;
> -			wakeup = <1>;
> +			wakeup-source;
>  			label = "DSW2-1";
>  			linux,code = <KEY_1>;
>  			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
>  		};
>  		button@2 {
>  			debounce_interval = <50>;
> -			wakeup = <1>;
> +			wakeup-source;
>  			label = "DSW2-2";
>  			linux,code = <KEY_2>;
>  			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
>  		};
>  		button@3 {
>  			debounce_interval = <50>;
> -			wakeup = <1>;
> +			wakeup-source;
>  			label = "DSW2-3";
>  			linux,code = <KEY_3>;
>  			gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
>  		};
>  		button@4 {
>  			debounce_interval = <50>;
> -			wakeup = <1>;
> +			wakeup-source;
>  			label = "DSW2-4";
>  			linux,code = <KEY_4>;
>  			gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
> diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
> index 32a5ccb14e7e..e80e42163883 100644
> --- a/arch/arm/boot/dts/ste-snowball.dts
> +++ b/arch/arm/boot/dts/ste-snowball.dts
> @@ -47,35 +47,35 @@
>  
>  		button@1 {
>  			debounce_interval = <50>;
> -			wakeup = <1>;
> +			wakeup-source;
>  			linux,code = <2>;
>  			label = "userpb";
>  			gpios = <&gpio1 0 0x4>;
>  		};
>  		button@2 {
>  			debounce_interval = <50>;
> -			wakeup = <1>;
> +			wakeup-source;
>  			linux,code = <3>;
>  			label = "extkb1";
>  			gpios = <&gpio4 23 0x4>;
>  		};
>  		button@3 {
>  			debounce_interval = <50>;
> -			wakeup = <1>;
> +			wakeup-source;
>  			linux,code = <4>;
>  			label = "extkb2";
>  			gpios = <&gpio4 24 0x4>;
>  		};
>  		button@4 {
>  			debounce_interval = <50>;
> -			wakeup = <1>;
> +			wakeup-source;
>  			linux,code = <5>;
>  			label = "extkb3";
>  			gpios = <&gpio5 1 0x4>;
>  		};
>  		button@5 {
>  			debounce_interval = <50>;
> -			wakeup = <1>;
> +			wakeup-source;
>  			linux,code = <6>;
>  			label = "extkb4";
>  			gpios = <&gpio5 2 0x4>;
> diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> index 05e461dc6c1f..a15e1fb4d192 100644
> --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> @@ -61,42 +61,42 @@
>  
>  				button@1 {
>  					debounce_interval = <50>;
> -					wakeup = <1>;
> +					wakeup-source;
>  					linux,code = <116>;
>  					label = "POWER";
>  					gpios = <&iofpga_gpio0 0 0x4>;
>  				};
>  				button@2 {
>  					debounce_interval = <50>;
> -					wakeup = <1>;
> +					wakeup-source;
>  					linux,code = <102>;
>  					label = "HOME";
>  					gpios = <&iofpga_gpio0 1 0x4>;
>  				};
>  				button@3 {
>  					debounce_interval = <50>;
> -					wakeup = <1>;
> +					wakeup-source;
>  					linux,code = <152>;
>  					label = "RLOCK";
>  					gpios = <&iofpga_gpio0 2 0x4>;
>  				};
>  				button@4 {
>  					debounce_interval = <50>;
> -					wakeup = <1>;
> +					wakeup-source;
>  					linux,code = <115>;
>  					label = "VOL+";
>  					gpios = <&iofpga_gpio0 3 0x4>;
>  				};
>  				button@5 {
>  					debounce_interval = <50>;
> -					wakeup = <1>;
> +					wakeup-source;
>  					linux,code = <114>;
>  					label = "VOL-";
>  					gpios = <&iofpga_gpio0 4 0x4>;
>  				};
>  				button@6 {
>  					debounce_interval = <50>;
> -					wakeup = <1>;
> +					wakeup-source;
>  					linux,code = <99>;
>  					label = "NMI";
>  					gpios = <&iofpga_gpio0 5 0x4>;
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 
--
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/

[toc] | [prev] | [next] | [standalone]

#1246440

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-14 11:10 +0200
Message-ID<qjqem-2hl-31@gated-at.bofh.it>
In reply to#1246223

On 14/10/15 01:13, Simon Horman wrote:
> [cc linux-sh]
>
> On Tue, Oct 13, 2015 at 02:32:43PM +0100, Sudeep Holla wrote:
>> The keyboard driver for GPIO buttons(gpio-keys) checks for one of the
>> two boolean properties to enable gpio buttons as wakeup source:
>> 1. "wakeup-source" or
>> 2. the legacy "gpio-key,wakeup"
>>
>> However juno, ste-snowball and emev2-kzm9d dts file have a undetected
>> "wakeup" property to indictate the wakeup source.
>>
>> This patch fixes it by making use of "wakeup-source" property.
>>
>> Cc: Simon Horman <horms@verge.net.au>
>> Cc: Magnus Damm <magnus.damm@gmail.com>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
>> ---
>>   arch/arm/boot/dts/emev2-kzm9d.dts             |  8 ++++----
>>   arch/arm/boot/dts/ste-snowball.dts            | 10 +++++-----
>>   arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 12 ++++++------
>>   3 files changed, 15 insertions(+), 15 deletions(-)
>
> emev2-kzm9d portion:
>
> Acked-by: Simon Horman <horms+renesas@verge.net.au>
>
> My preferred course of action would be to take that portion through the
> renesas tree if it was broken out into a separate patch. But I won't
> object if someone wants to take the whole patch/series.

I can split this patch, but it is more like a bug fix IMO, I can't use
these GPIO as wakeup on Juno. So I hope arm-soc guys take it directly.
If not, I can split and sent it separately.

-- 
Regards,
Sudeep
--
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/

[toc] | [prev] | [next] | [standalone]

#1246892

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-14 17:30 +0200
Message-ID<qjwa6-2yi-15@gated-at.bofh.it>
In reply to#1245715
Hi Linus,

On 13/10/15 14:32, Sudeep Holla wrote:
> The keyboard driver for GPIO buttons(gpio-keys) checks for one of the
> two boolean properties to enable gpio buttons as wakeup source:
> 1. "wakeup-source" or
> 2. the legacy "gpio-key,wakeup"
>
> However juno, ste-snowball and emev2-kzm9d dts file have a undetected
> "wakeup" property to indictate the wakeup source.
>
> This patch fixes it by making use of "wakeup-source" property.
>
> Cc: Simon Horman <horms@verge.net.au>
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>

Please review this and provide ack if you are fine with the change for
ste-snowball. I can then ask arm-soc guys to pick this up as fix for v4.3

-- 
Regards,
Sudeep
--
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/

[toc] | [prev] | [next] | [standalone]

#1247872

FromLinus Walleij <linus.walleij@linaro.org>
Date2015-10-15 17:00 +0200
Message-ID<qjSaC-19v-15@gated-at.bofh.it>
In reply to#1245715
On Tue, Oct 13, 2015 at 3:32 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:

> The keyboard driver for GPIO buttons(gpio-keys) checks for one of the
> two boolean properties to enable gpio buttons as wakeup source:
> 1. "wakeup-source" or
> 2. the legacy "gpio-key,wakeup"
>
> However juno, ste-snowball and emev2-kzm9d dts file have a undetected
> "wakeup" property to indictate the wakeup source.
>
> This patch fixes it by making use of "wakeup-source" property.
>
> Cc: Simon Horman <horms@verge.net.au>
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

OK nice,
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij
--
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/

[toc] | [prev] | [next] | [standalone]

#1247892

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-15 17:30 +0200
Message-ID<qjSDF-1Zy-35@gated-at.bofh.it>
In reply to#1247872
Hi Arnd,

On 15/10/15 15:57, Linus Walleij wrote:
> On Tue, Oct 13, 2015 at 3:32 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:
>
>> The keyboard driver for GPIO buttons(gpio-keys) checks for one of the
>> two boolean properties to enable gpio buttons as wakeup source:
>> 1. "wakeup-source" or
>> 2. the legacy "gpio-key,wakeup"
>>
>> However juno, ste-snowball and emev2-kzm9d dts file have a undetected
>> "wakeup" property to indicate the wakeup source.
>>
>> This patch fixes it by making use of "wakeup-source" property.
>>
>> Cc: Simon Horman <horms@verge.net.au>
>> Cc: Magnus Damm <magnus.damm@gmail.com>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
>
> OK nice,
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
>

Can you pick this up as fix for v4.3 with Ack from Simon and Linus
Walleij ? I will repost 2/2 as a part of bigger cleanup for v4.4

-- 
Regards,
Sudeep
--
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/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web