Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

authored by

Sudeep Holla and committed by
Heiko Stuebner
4f66f247 29f12bba

+9 -10
+1 -2
arch/arm/boot/dts/rk3066a-bqcurie2.dts
··· 86 86 linux,code = <116>; 87 87 label = "GPIO Key Power"; 88 88 linux,input-type = <1>; 89 - gpio-key,wakeup = <1>; 89 + wakeup-source; 90 90 debounce-interval = <100>; 91 91 }; 92 92 button@1 { ··· 94 94 linux,code = <104>; 95 95 label = "GPIO Key Vol-"; 96 96 linux,input-type = <1>; 97 - gpio-key,wakeup = <0>; 98 97 debounce-interval = <100>; 99 98 }; 100 99 /* VOL+ comes somehow thru the ADC */
+1 -1
arch/arm/boot/dts/rk3066a-rayeager.dts
··· 65 65 #size-cells = <0>; 66 66 67 67 button@0 { 68 - gpio-key,wakeup = <1>; 68 + wakeup-source; 69 69 gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; 70 70 label = "GPIO Power"; 71 71 linux,code = <116>;
+1 -1
arch/arm/boot/dts/rk3188-radxarock.dts
··· 63 63 linux,code = <116>; 64 64 label = "GPIO Key Power"; 65 65 linux,input-type = <1>; 66 - gpio-key,wakeup = <1>; 66 + wakeup-source; 67 67 debounce-interval = <100>; 68 68 }; 69 69 };
+1 -1
arch/arm/boot/dts/rk3288-evb.dtsi
··· 110 110 linux,code = <116>; 111 111 label = "GPIO Key Power"; 112 112 linux,input-type = <1>; 113 - gpio-key,wakeup = <1>; 113 + wakeup-source; 114 114 debounce-interval = <100>; 115 115 }; 116 116 };
+1 -1
arch/arm/boot/dts/rk3288-firefly.dtsi
··· 91 91 #size-cells = <0>; 92 92 93 93 button@0 { 94 - gpio-key,wakeup = <1>; 94 + wakeup-source; 95 95 gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; 96 96 label = "GPIO Power"; 97 97 linux,code = <116>;
+1 -1
arch/arm/boot/dts/rk3288-popmetal.dts
··· 74 74 linux,code = <116>; 75 75 label = "GPIO Key Power"; 76 76 linux,input-type = <1>; 77 - gpio-key,wakeup = <1>; 77 + wakeup-source; 78 78 debounce-interval = <100>; 79 79 }; 80 80 };
+1 -1
arch/arm/boot/dts/rk3288-r89.dts
··· 73 73 linux,code = <116>; 74 74 label = "GPIO Key Power"; 75 75 linux,input-type = <1>; 76 - gpio-key,wakeup = <1>; 76 + wakeup-source; 77 77 debounce-interval = <100>; 78 78 }; 79 79 };
+1 -1
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
··· 108 108 lid { 109 109 label = "Lid"; 110 110 gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; 111 - gpio-key,wakeup; 111 + wakeup-source; 112 112 linux,code = <0>; /* SW_LID */ 113 113 linux,input-type = <5>; /* EV_SW */ 114 114 debounce-interval = <1>;
+1 -1
arch/arm/boot/dts/rk3288-veyron.dtsi
··· 64 64 gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; 65 65 linux,code = <KEY_POWER>; 66 66 debounce-interval = <100>; 67 - gpio-key,wakeup; 67 + wakeup-source; 68 68 }; 69 69 }; 70 70