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

ARM: dts: shmobile/r8a7xxx: replace gpio-key, wakeup with wakeup-source property

Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
check for/support the legacy "gpio-key,wakeup" boolean property to
enable gpio buttons as wakeup source, "wakeup-source" is the new
standard binding.

This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

authored by

Sudeep Holla and committed by
Simon Horman
0cc16889 761b11e1

+18 -18
+1 -1
arch/arm/boot/dts/r8a73a4-ape6evm.dts
··· 110 110 gpios = <&pfc 324 GPIO_ACTIVE_LOW>; 111 111 linux,code = <KEY_0>; 112 112 label = "S16"; 113 - gpio-key,wakeup; 113 + wakeup-source; 114 114 }; 115 115 116 116 menu-key {
+1 -1
arch/arm/boot/dts/r8a7740-armadillo800eva.dts
··· 85 85 gpios = <&pfc 99 GPIO_ACTIVE_LOW>; 86 86 linux,code = <KEY_POWER>; 87 87 label = "SW3"; 88 - gpio-key,wakeup; 88 + wakeup-source; 89 89 }; 90 90 91 91 back-key {
+4 -4
arch/arm/boot/dts/r8a7790-lager.dts
··· 77 77 button@1 { 78 78 linux,code = <KEY_1>; 79 79 label = "SW2-1"; 80 - gpio-key,wakeup; 80 + wakeup-source; 81 81 debounce-interval = <20>; 82 82 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 83 83 }; 84 84 button@2 { 85 85 linux,code = <KEY_2>; 86 86 label = "SW2-2"; 87 - gpio-key,wakeup; 87 + wakeup-source; 88 88 debounce-interval = <20>; 89 89 gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; 90 90 }; 91 91 button@3 { 92 92 linux,code = <KEY_3>; 93 93 label = "SW2-3"; 94 - gpio-key,wakeup; 94 + wakeup-source; 95 95 debounce-interval = <20>; 96 96 gpios = <&gpio1 26 GPIO_ACTIVE_LOW>; 97 97 }; 98 98 button@4 { 99 99 linux,code = <KEY_4>; 100 100 label = "SW2-4"; 101 - gpio-key,wakeup; 101 + wakeup-source; 102 102 debounce-interval = <20>; 103 103 gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; 104 104 };
+11 -11
arch/arm/boot/dts/r8a7791-koelsch.dts
··· 79 79 gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; 80 80 linux,code = <KEY_1>; 81 81 label = "SW2-1"; 82 - gpio-key,wakeup; 82 + wakeup-source; 83 83 debounce-interval = <20>; 84 84 }; 85 85 key-2 { 86 86 gpios = <&gpio5 1 GPIO_ACTIVE_LOW>; 87 87 linux,code = <KEY_2>; 88 88 label = "SW2-2"; 89 - gpio-key,wakeup; 89 + wakeup-source; 90 90 debounce-interval = <20>; 91 91 }; 92 92 key-3 { 93 93 gpios = <&gpio5 2 GPIO_ACTIVE_LOW>; 94 94 linux,code = <KEY_3>; 95 95 label = "SW2-3"; 96 - gpio-key,wakeup; 96 + wakeup-source; 97 97 debounce-interval = <20>; 98 98 }; 99 99 key-4 { 100 100 gpios = <&gpio5 3 GPIO_ACTIVE_LOW>; 101 101 linux,code = <KEY_4>; 102 102 label = "SW2-4"; 103 - gpio-key,wakeup; 103 + wakeup-source; 104 104 debounce-interval = <20>; 105 105 }; 106 106 key-a { 107 107 gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; 108 108 linux,code = <KEY_A>; 109 109 label = "SW30"; 110 - gpio-key,wakeup; 110 + wakeup-source; 111 111 debounce-interval = <20>; 112 112 }; 113 113 key-b { 114 114 gpios = <&gpio7 1 GPIO_ACTIVE_LOW>; 115 115 linux,code = <KEY_B>; 116 116 label = "SW31"; 117 - gpio-key,wakeup; 117 + wakeup-source; 118 118 debounce-interval = <20>; 119 119 }; 120 120 key-c { 121 121 gpios = <&gpio7 2 GPIO_ACTIVE_LOW>; 122 122 linux,code = <KEY_C>; 123 123 label = "SW32"; 124 - gpio-key,wakeup; 124 + wakeup-source; 125 125 debounce-interval = <20>; 126 126 }; 127 127 key-d { 128 128 gpios = <&gpio7 3 GPIO_ACTIVE_LOW>; 129 129 linux,code = <KEY_D>; 130 130 label = "SW33"; 131 - gpio-key,wakeup; 131 + wakeup-source; 132 132 debounce-interval = <20>; 133 133 }; 134 134 key-e { 135 135 gpios = <&gpio7 4 GPIO_ACTIVE_LOW>; 136 136 linux,code = <KEY_E>; 137 137 label = "SW34"; 138 - gpio-key,wakeup; 138 + wakeup-source; 139 139 debounce-interval = <20>; 140 140 }; 141 141 key-f { 142 142 gpios = <&gpio7 5 GPIO_ACTIVE_LOW>; 143 143 linux,code = <KEY_F>; 144 144 label = "SW35"; 145 - gpio-key,wakeup; 145 + wakeup-source; 146 146 debounce-interval = <20>; 147 147 }; 148 148 key-g { 149 149 gpios = <&gpio7 6 GPIO_ACTIVE_LOW>; 150 150 linux,code = <KEY_G>; 151 151 label = "SW36"; 152 - gpio-key,wakeup; 152 + wakeup-source; 153 153 debounce-interval = <20>; 154 154 }; 155 155 };
+1 -1
arch/arm/boot/dts/sh73a0-kzm9g.dts
··· 147 147 gpios = <&pcf8575 14 GPIO_ACTIVE_LOW>; 148 148 linux,code = <KEY_HOME>; 149 149 label = "SW1"; 150 - gpio-key,wakeup; 150 + wakeup-source; 151 151 }; 152 152 }; 153 153