Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4db7062c authored Oct 16, 2015 by Sudeep Holla Committed by Olof Johansson Oct 22, 2015

ARM: dts: fix gpio-keys wakeup-source property



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: Magnus Damm <magnus.damm@gmail.com>
Acked-by: Simon Horman <horms@verge.net.au>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent 55f41297

arch/arm/boot/dts/emev2-kzm9d.dts

+4 −4

Original line number	Diff line number	Diff line
		@@ -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>;

arch/arm/boot/dts/ste-snowball.dts

+5 −5

Original line number	Diff line number	Diff line
		@@ -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>;

arch/arm64/boot/dts/arm/juno-motherboard.dtsi

+6 −6

Original line number	Diff line number	Diff line
		@@ -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>;