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

ARM: dts: marvell: align gpio-key node names with dtschema

The node names should be generic and DT schema expects certain pattern
(e.g. with key/button/switch).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220616005333.18491-13-krzysztof.kozlowski@linaro.org

Krzysztof Kozlowski 41340053 eef3af89

+24 -24
+4 -4
arch/arm/boot/dts/armada-370-c200-v2.dts
··· 75 75 pinctrl-0 = <&pmx_buttons>; 76 76 pinctrl-names = "default"; 77 77 78 - power { 78 + button-power { 79 79 label = "Power Button"; 80 80 linux,code = <KEY_POWER>; 81 81 gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; 82 82 }; 83 83 84 - reset { 84 + button-reset { 85 85 label = "Reset Button"; 86 86 linux,code = <KEY_RESTART>; 87 87 gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; 88 88 }; 89 89 90 - usb1 { 90 + button-usb1 { 91 91 label = "USB1 Button"; 92 92 linux,code = <BTN_0>; 93 93 gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; 94 94 }; 95 95 96 - usb2 { 96 + button-usb2 { 97 97 label = "USB2 Button"; 98 98 linux,code = <BTN_1>; 99 99 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+3 -3
arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
··· 111 111 #address-cells = <1>; 112 112 #size-cells = <0>; 113 113 114 - power { 114 + button-power { 115 115 label = "Power button"; 116 116 linux,code = <KEY_POWER>; 117 117 gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; 118 118 debounce-interval = <100>; 119 119 }; 120 - backup { 120 + button-backup { 121 121 label = "Backup button"; 122 122 linux,code = <KEY_OPTION>; 123 123 gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; 124 124 debounce-interval = <100>; 125 125 }; 126 - reset { 126 + button-reset { 127 127 label = "Reset Button"; 128 128 linux,code = <KEY_RESTART>; 129 129 gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
+3 -3
arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
··· 86 86 #address-cells = <1>; 87 87 #size-cells = <0>; 88 88 89 - power { 89 + button-power { 90 90 label = "Power button"; 91 91 linux,code = <KEY_POWER>; 92 92 gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>; 93 93 debounce-interval = <100>; 94 94 }; 95 - reset { 95 + button-reset { 96 96 label = "Reset Button"; 97 97 linux,code = <KEY_RESTART>; 98 98 gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; 99 99 debounce-interval = <100>; 100 100 }; 101 - button { 101 + button-usb { 102 102 label = "USB VBUS error"; 103 103 linux,code = <KEY_UNKNOWN>; 104 104 gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
+1 -1
arch/arm/boot/dts/armada-381-netgear-gs110emx.dts
··· 24 24 pinctrl-0 = <&front_button_pins>; 25 25 pinctrl-names = "default"; 26 26 27 - factory_default { 27 + key-factory-default { 28 28 label = "Factory Default"; 29 29 gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; 30 30 linux,code = <KEY_RESTART>;
+2 -2
arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi
··· 256 256 pinctrl-0 = <&cf_gtr_rear_button_pins &cf_gtr_front_button_pins>; 257 257 pinctrl-names = "default"; 258 258 259 - button_0 { 259 + button-0 { 260 260 label = "Rear Button"; 261 261 gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; 262 262 linux,can-disable; 263 263 linux,code = <BTN_0>; 264 264 }; 265 265 266 - button_1 { 266 + button-1 { 267 267 label = "Front Button"; 268 268 gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; 269 269 linux,can-disable;
+2 -2
arch/arm/boot/dts/armada-385-linksys.dtsi
··· 53 53 pinctrl-0 = <&gpio_keys_pins>; 54 54 pinctrl-names = "default"; 55 55 56 - wps { 56 + button-wps { 57 57 label = "WPS"; 58 58 linux,code = <KEY_WPS_BUTTON>; 59 59 gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; 60 60 }; 61 61 62 - reset { 62 + button-reset { 63 63 label = "Factory Reset Button"; 64 64 linux,code = <KEY_RESTART>; 65 65 gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
+1 -1
arch/arm/boot/dts/armada-388-clearfog-base.dts
··· 19 19 pinctrl-0 = <&rear_button_pins>; 20 20 pinctrl-names = "default"; 21 21 22 - button_0 { 22 + button-0 { 23 23 /* The rear SW3 button */ 24 24 label = "Rear Button"; 25 25 gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+1 -1
arch/arm/boot/dts/armada-388-clearfog.dts
··· 35 35 pinctrl-0 = <&rear_button_pins>; 36 36 pinctrl-names = "default"; 37 37 38 - button_0 { 38 + button-0 { 39 39 /* The rear SW3 button */ 40 40 label = "Rear Button"; 41 41 gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+2 -2
arch/arm/boot/dts/armada-xp-axpwifiap.dts
··· 69 69 }; 70 70 }; 71 71 72 - gpio_keys { 72 + gpio-keys { 73 73 compatible = "gpio-keys"; 74 74 #address-cells = <1>; 75 75 #size-cells = <0>; 76 76 pinctrl-0 = <&keys_pin>; 77 77 pinctrl-names = "default"; 78 78 79 - reset { 79 + button-reset { 80 80 label = "Factory Reset Button"; 81 81 linux,code = <KEY_SETUP>; 82 82 gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
+3 -3
arch/arm/boot/dts/armada-xp-linksys-mamba.dts
··· 172 172 }; 173 173 }; 174 174 175 - gpio_keys { 175 + gpio-keys { 176 176 compatible = "gpio-keys"; 177 177 #address-cells = <1>; 178 178 #size-cells = <0>; 179 179 pinctrl-0 = <&keys_pin>; 180 180 pinctrl-names = "default"; 181 181 182 - wps { 182 + button-wps { 183 183 label = "WPS"; 184 184 linux,code = <KEY_WPS_BUTTON>; 185 185 gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; 186 186 }; 187 187 188 - reset { 188 + button-reset { 189 189 label = "Factory Reset Button"; 190 190 linux,code = <KEY_RESTART>; 191 191 gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
+2 -2
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
··· 97 97 }; 98 98 }; 99 99 100 - gpio_keys { 100 + gpio-keys { 101 101 compatible = "gpio-keys"; 102 102 #address-cells = <1>; 103 103 #size-cells = <0>; 104 104 105 - init { 105 + button-init { 106 106 label = "Init Button"; 107 107 linux,code = <KEY_POWER>; 108 108 gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;