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: imx: align gpio-keys node names with dtschema

The node names should be generic and DT schema expects certain pattern.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Shawn Guo e067767e 1bad8bca

+75 -75
+3 -3
arch/arm/boot/dts/imx23-xfi3.dts
··· 158 158 default-brightness-level = <6>; 159 159 }; 160 160 161 - gpio_keys { 161 + gpio-keys { 162 162 compatible = "gpio-keys"; 163 163 pinctrl-names = "default"; 164 164 pinctrl-0 = <&key_pins_a>; 165 165 166 - voldown { 166 + key-voldown { 167 167 label = "volume-down"; 168 168 linux,code = <114>; 169 169 gpios = <&gpio2 7 0>; 170 170 debounce-interval = <20>; 171 171 }; 172 172 173 - volup { 173 + key-volup { 174 174 label = "volume-up"; 175 175 linux,code = <115>; 176 176 gpios = <&gpio2 8 0>;
+2 -2
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
··· 13 13 model = "Eukrea MBIMXSD25"; 14 14 compatible = "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25"; 15 15 16 - gpio_keys { 16 + gpio-keys { 17 17 compatible = "gpio-keys"; 18 18 pinctrl-names = "default"; 19 19 pinctrl-0 = <&pinctrl_gpiokeys>; 20 20 21 - bp1 { 21 + button { 22 22 label = "BP1"; 23 23 gpios = <&gpio3 18 GPIO_ACTIVE_LOW>; 24 24 linux,code = <BTN_MISC>;
+2 -2
arch/arm/boot/dts/imx28-cfa10049.dts
··· 388 388 }; 389 389 }; 390 390 391 - gpio_keys { 391 + gpio-keys { 392 392 compatible = "gpio-keys"; 393 393 pinctrl-names = "default"; 394 394 pinctrl-0 = <&rotary_btn_pins_cfa10049>; 395 395 396 - rotary_button { 396 + rotary-button { 397 397 label = "rotary_button"; 398 398 gpios = <&gpio3 26 1>; 399 399 debounce-interval = <10>;
+1 -1
arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
··· 204 204 pinctrl-names = "default"; 205 205 pinctrl-0 = <&enocean_button>; 206 206 207 - enocean { 207 + key-enocean { 208 208 label = "EnOcean"; 209 209 linux,code = <KEY_NEW>; 210 210 gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>;
+4 -4
arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
··· 19 19 default-brightness-level = <10>; 20 20 }; 21 21 22 - button-sw3 { 22 + gpio-keys-0 { 23 23 compatible = "gpio-keys"; 24 24 pinctrl-names = "default"; 25 25 pinctrl-0 = <&gpio_button_sw3_pins_mbmx28lc>; 26 26 27 - sw3 { 27 + switch-sw3 { 28 28 label = "SW3"; 29 29 gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; 30 30 linux,code = <BTN_MISC>; ··· 32 32 }; 33 33 }; 34 34 35 - button-sw4 { 35 + gpio-keys-1 { 36 36 compatible = "gpio-keys"; 37 37 pinctrl-names = "default"; 38 38 pinctrl-0 = <&gpio_button_sw4_pins_mbmx28lc>; 39 39 40 - sw4 { 40 + switch-sw4 { 41 41 label = "SW4"; 42 42 gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; 43 43 linux,code = <BTN_MISC>;
+2 -2
arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
··· 13 13 model = "Eukrea CPUIMX35"; 14 14 compatible = "eukrea,mbimxsd35-baseboard", "eukrea,cpuimx35", "fsl,imx35"; 15 15 16 - gpio_keys { 16 + gpio-keys { 17 17 compatible = "gpio-keys"; 18 18 pinctrl-names = "default"; 19 19 pinctrl-0 = <&pinctrl_bp1>; 20 20 21 - bp1 { 21 + button { 22 22 label = "BP1"; 23 23 gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; 24 24 linux,code = <BTN_MISC>;
+3 -3
arch/arm/boot/dts/imx50-kobo-aura.dts
··· 38 38 pinctrl-names = "default"; 39 39 pinctrl-0 = <&pinctrl_gpiokeys>; 40 40 41 - power { 41 + key-power { 42 42 label = "Power Button"; 43 43 gpios = <&gpio4 10 GPIO_ACTIVE_LOW>; 44 44 linux,code = <KEY_POWER>; 45 45 }; 46 46 47 - hallsensor { 47 + event-hallsensor { 48 48 label = "Hallsensor"; 49 49 gpios = <&gpio5 15 GPIO_ACTIVE_LOW>; 50 50 linux,code = <KEY_RESERVED>; 51 51 linux,input-type = <EV_SW>; 52 52 }; 53 53 54 - frontlight { 54 + event-frontlight { 55 55 label = "Frontlight"; 56 56 gpios = <&gpio4 1 GPIO_ACTIVE_LOW>; 57 57 linux,code = <KEY_DISPLAYTOGGLE>;
+1 -1
arch/arm/boot/dts/imx51-babbage.dts
··· 154 154 pinctrl-names = "default"; 155 155 pinctrl-0 = <&pinctrl_gpio_keys>; 156 156 157 - power { 157 + key-power { 158 158 label = "Power Button"; 159 159 gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; 160 160 linux,code = <KEY_POWER>;
+5 -5
arch/arm/boot/dts/imx53-ard.dts
··· 61 61 gpio-keys { 62 62 compatible = "gpio-keys"; 63 63 64 - home { 64 + key-home { 65 65 label = "Home"; 66 66 gpios = <&gpio5 10 0>; 67 67 linux,code = <KEY_HOME>; 68 68 wakeup-source; 69 69 }; 70 70 71 - back { 71 + key-back { 72 72 label = "Back"; 73 73 gpios = <&gpio5 11 0>; 74 74 linux,code = <KEY_BACK>; 75 75 wakeup-source; 76 76 }; 77 77 78 - program { 78 + key-program { 79 79 label = "Program"; 80 80 gpios = <&gpio5 12 0>; 81 81 linux,code = <KEY_PROGRAM >; 82 82 wakeup-source; 83 83 }; 84 84 85 - volume-up { 85 + key-volume-up { 86 86 label = "Volume Up"; 87 87 gpios = <&gpio5 13 0>; 88 88 linux,code = <KEY_VOLUMEUP>; 89 89 }; 90 90 91 - volume-down { 91 + key-volume-down { 92 92 label = "Volume Down"; 93 93 gpios = <&gpio4 0 0>; 94 94 linux,code = <KEY_VOLUMEDOWN>;
+3 -3
arch/arm/boot/dts/imx53-qsb-common.dtsi
··· 45 45 gpio-keys { 46 46 compatible = "gpio-keys"; 47 47 48 - power { 48 + key-power { 49 49 label = "Power Button"; 50 50 gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; 51 51 linux,code = <KEY_POWER>; 52 52 }; 53 53 54 - volume-up { 54 + key-volume-up { 55 55 label = "Volume Up"; 56 56 gpios = <&gpio2 14 GPIO_ACTIVE_LOW>; 57 57 linux,code = <KEY_VOLUMEUP>; 58 58 wakeup-source; 59 59 }; 60 60 61 - volume-down { 61 + key-volume-down { 62 62 label = "Volume Down"; 63 63 gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; 64 64 linux,code = <KEY_VOLUMEDOWN>;
+2 -2
arch/arm/boot/dts/imx53-smd.dts
··· 19 19 gpio-keys { 20 20 compatible = "gpio-keys"; 21 21 22 - volume-up { 22 + key-volume-up { 23 23 label = "Volume Up"; 24 24 gpios = <&gpio2 14 0>; 25 25 linux,code = <KEY_VOLUMEUP>; 26 26 }; 27 27 28 - volume-down { 28 + key-volume-down { 29 29 label = "Volume Down"; 30 30 gpios = <&gpio2 15 0>; 31 31 linux,code = <KEY_VOLUMEDOWN>;
+1 -1
arch/arm/boot/dts/imx53-tx53.dtsi
··· 81 81 pinctrl-names = "default"; 82 82 pinctrl-0 = <&pinctrl_gpio_key>; 83 83 84 - power { 84 + key-power { 85 85 label = "Power Button"; 86 86 gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; 87 87 linux,code = <116>; /* KEY_POWER */
+4 -4
arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
··· 6 6 keyboard { 7 7 compatible = "gpio-keys"; 8 8 9 - btn0 { 9 + button-0 { 10 10 gpios = <&pcf8575 0 GPIO_ACTIVE_LOW>; 11 11 label = "btn0"; 12 12 linux,code = <KEY_WAKEUP>; ··· 14 14 wakeup-source; 15 15 }; 16 16 17 - btn1 { 17 + button-1 { 18 18 gpios = <&pcf8575 1 GPIO_ACTIVE_LOW>; 19 19 label = "btn1"; 20 20 linux,code = <KEY_WAKEUP>; ··· 22 22 wakeup-source; 23 23 }; 24 24 25 - btn2 { 25 + button-2 { 26 26 gpios = <&pcf8575 2 GPIO_ACTIVE_LOW>; 27 27 label = "btn2"; 28 28 linux,code = <KEY_WAKEUP>; ··· 30 30 wakeup-source; 31 31 }; 32 32 33 - btn3 { 33 + button-3 { 34 34 gpios = <&pcf8575 3 GPIO_ACTIVE_LOW>; 35 35 label = "btn3"; 36 36 linux,code = <KEY_WAKEUP>;
+1 -1
arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi
··· 188 188 rotary-encoder-key { 189 189 compatible = "gpio-keys"; 190 190 191 - rotary-encoder-press { 191 + rotary-encoder-event { 192 192 label = "rotary-encoder press"; 193 193 gpios = <&tca6424a 0 GPIO_ACTIVE_HIGH>; 194 194 linux,code = <KEY_ENTER>;
+16 -16
arch/arm/boot/dts/imx6dl-prtmvt.dts
··· 51 51 pinctrl-0 = <&pinctrl_gpiokeys>; 52 52 autorepeat; 53 53 54 - power { 54 + key-power { 55 55 label = "Power Button"; 56 56 gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; 57 57 linux,code = <KEY_POWER>; 58 58 wakeup-source; 59 59 }; 60 60 61 - f1 { 61 + key-f1 { 62 62 label = "GPIO Key F1"; 63 63 linux,code = <KEY_F1>; 64 64 gpios = <&gpio_pca 0 GPIO_ACTIVE_LOW>; 65 65 }; 66 66 67 - f2 { 67 + key-f2 { 68 68 label = "GPIO Key F2"; 69 69 linux,code = <KEY_F2>; 70 70 gpios = <&gpio_pca 1 GPIO_ACTIVE_LOW>; 71 71 }; 72 72 73 - f3 { 73 + key-f3 { 74 74 label = "GPIO Key F3"; 75 75 linux,code = <KEY_F3>; 76 76 gpios = <&gpio_pca 2 GPIO_ACTIVE_LOW>; 77 77 }; 78 78 79 - f4 { 79 + key-f4 { 80 80 label = "GPIO Key F4"; 81 81 linux,code = <KEY_F4>; 82 82 gpios = <&gpio_pca 3 GPIO_ACTIVE_LOW>; 83 83 }; 84 84 85 - f5 { 85 + key-f5 { 86 86 label = "GPIO Key F5"; 87 87 linux,code = <KEY_F5>; 88 88 gpios = <&gpio_pca 4 GPIO_ACTIVE_LOW>; 89 89 }; 90 90 91 - cycle { 91 + key-cycle { 92 92 label = "GPIO Key CYCLE"; 93 93 linux,code = <KEY_CYCLEWINDOWS>; 94 94 gpios = <&gpio_pca 5 GPIO_ACTIVE_LOW>; 95 95 }; 96 96 97 - esc { 97 + key-esc { 98 98 label = "GPIO Key ESC"; 99 99 linux,code = <KEY_ESC>; 100 100 gpios = <&gpio_pca 6 GPIO_ACTIVE_LOW>; 101 101 }; 102 102 103 - up { 103 + key-up { 104 104 label = "GPIO Key UP"; 105 105 linux,code = <KEY_UP>; 106 106 gpios = <&gpio_pca 7 GPIO_ACTIVE_LOW>; 107 107 }; 108 108 109 - down { 109 + key-down { 110 110 label = "GPIO Key DOWN"; 111 111 linux,code = <KEY_DOWN>; 112 112 gpios = <&gpio_pca 8 GPIO_ACTIVE_LOW>; 113 113 }; 114 114 115 - ok { 115 + key-ok { 116 116 label = "GPIO Key OK"; 117 117 linux,code = <KEY_OK>; 118 118 gpios = <&gpio_pca 9 GPIO_ACTIVE_LOW>; 119 119 }; 120 120 121 - f6 { 121 + key-f6 { 122 122 label = "GPIO Key F6"; 123 123 linux,code = <KEY_F6>; 124 124 gpios = <&gpio_pca 10 GPIO_ACTIVE_LOW>; 125 125 }; 126 126 127 - f7 { 127 + key-f7 { 128 128 label = "GPIO Key F7"; 129 129 linux,code = <KEY_F7>; 130 130 gpios = <&gpio_pca 11 GPIO_ACTIVE_LOW>; 131 131 }; 132 132 133 - f8 { 133 + key-f8 { 134 134 label = "GPIO Key F8"; 135 135 linux,code = <KEY_F8>; 136 136 gpios = <&gpio_pca 12 GPIO_ACTIVE_LOW>; 137 137 }; 138 138 139 - f9 { 139 + key-f9 { 140 140 label = "GPIO Key F9"; 141 141 linux,code = <KEY_F9>; 142 142 gpios = <&gpio_pca 13 GPIO_ACTIVE_LOW>; 143 143 }; 144 144 145 - f10 { 145 + key-f10 { 146 146 label = "GPIO Key F10"; 147 147 linux,code = <KEY_F10>; 148 148 gpios = <&gpio_pca 14 GPIO_ACTIVE_LOW>;
+15 -15
arch/arm/boot/dts/imx6dl-prtvt7.dts
··· 62 62 compatible = "gpio-keys"; 63 63 autorepeat; 64 64 65 - esc { 65 + key-esc { 66 66 label = "GPIO Key ESC"; 67 67 linux,code = <KEY_ESC>; 68 68 gpios = <&gpio_pca 0 GPIO_ACTIVE_LOW>; 69 69 }; 70 70 71 - up { 71 + key-up { 72 72 label = "GPIO Key UP"; 73 73 linux,code = <KEY_UP>; 74 74 gpios = <&gpio_pca 1 GPIO_ACTIVE_LOW>; 75 75 }; 76 76 77 - down { 77 + key-down { 78 78 label = "GPIO Key DOWN"; 79 79 linux,code = <KEY_DOWN>; 80 80 gpios = <&gpio_pca 4 GPIO_ACTIVE_LOW>; 81 81 }; 82 82 83 - enter { 83 + key-enter { 84 84 label = "GPIO Key Enter"; 85 85 linux,code = <KEY_ENTER>; 86 86 gpios = <&gpio_pca 3 GPIO_ACTIVE_LOW>; 87 87 }; 88 88 89 - cycle { 89 + key-cycle { 90 90 label = "GPIO Key CYCLE"; 91 91 linux,code = <KEY_CYCLEWINDOWS>; 92 92 gpios = <&gpio_pca 2 GPIO_ACTIVE_LOW>; 93 93 }; 94 94 95 - f1 { 95 + key-f1 { 96 96 label = "GPIO Key F1"; 97 97 linux,code = <KEY_F1>; 98 98 gpios = <&gpio_pca 14 GPIO_ACTIVE_LOW>; 99 99 }; 100 100 101 - f2 { 101 + key-f2 { 102 102 label = "GPIO Key F2"; 103 103 linux,code = <KEY_F2>; 104 104 gpios = <&gpio_pca 13 GPIO_ACTIVE_LOW>; 105 105 }; 106 106 107 - f3 { 107 + key-f3 { 108 108 label = "GPIO Key F3"; 109 109 linux,code = <KEY_F3>; 110 110 gpios = <&gpio_pca 12 GPIO_ACTIVE_LOW>; 111 111 }; 112 112 113 - f4 { 113 + key-f4 { 114 114 label = "GPIO Key F4"; 115 115 linux,code = <KEY_F4>; 116 116 gpios = <&gpio_pca 11 GPIO_ACTIVE_LOW>; 117 117 }; 118 118 119 - f5 { 119 + key-f5 { 120 120 label = "GPIO Key F5"; 121 121 linux,code = <KEY_F5>; 122 122 gpios = <&gpio_pca 10 GPIO_ACTIVE_LOW>; 123 123 }; 124 124 125 - f6 { 125 + key-f6 { 126 126 label = "GPIO Key F6"; 127 127 linux,code = <KEY_F6>; 128 128 gpios = <&gpio_pca 5 GPIO_ACTIVE_LOW>; 129 129 }; 130 130 131 - f7 { 131 + key-f7 { 132 132 label = "GPIO Key F7"; 133 133 linux,code = <KEY_F7>; 134 134 gpios = <&gpio_pca 6 GPIO_ACTIVE_LOW>; 135 135 }; 136 136 137 - f8 { 137 + key-f8 { 138 138 label = "GPIO Key F8"; 139 139 linux,code = <KEY_F8>; 140 140 gpios = <&gpio_pca 7 GPIO_ACTIVE_LOW>; 141 141 }; 142 142 143 - f9 { 143 + key-f9 { 144 144 label = "GPIO Key F9"; 145 145 linux,code = <KEY_F9>; 146 146 gpios = <&gpio_pca 8 GPIO_ACTIVE_LOW>; 147 147 }; 148 148 149 - f10 { 149 + key-f10 { 150 150 label = "GPIO Key F10"; 151 151 linux,code = <KEY_F10>; 152 152 gpios = <&gpio_pca 9 GPIO_ACTIVE_LOW>;
+2 -2
arch/arm/boot/dts/imx6dl-victgo.dts
··· 18 18 pinctrl-0 = <&pinctrl_gpiokeys>; 19 19 autorepeat; 20 20 21 - power { 21 + key-power { 22 22 label = "Power Button"; 23 23 gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; 24 24 linux,code = <KEY_POWER>; 25 25 wakeup-source; 26 26 }; 27 27 28 - enter { 28 + key-enter { 29 29 label = "Rotary Key"; 30 30 gpios = <&gpio2 05 GPIO_ACTIVE_LOW>; 31 31 linux,code = <KEY_ENTER>;
+1 -1
arch/arm/boot/dts/imx6q-novena.dts
··· 86 86 linux,code = <KEY_POWER>; 87 87 }; 88 88 89 - lid { 89 + lid-event { 90 90 label = "Lid"; 91 91 gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; 92 92 linux,input-type = <5>; /* EV_SW */
+1 -1
arch/arm/boot/dts/imx6q-pistachio.dts
··· 100 100 pinctrl-names = "default"; 101 101 pinctrl-0 = <&pinctrl_gpio_keys>; 102 102 103 - power { 103 + key-power { 104 104 label = "Power Button"; 105 105 gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; 106 106 wakeup-source;
+1 -1
arch/arm/boot/dts/imx6q-utilite-pro.dts
··· 89 89 pinctrl-names = "default"; 90 90 pinctrl-0 = <&pinctrl_gpio_keys>; 91 91 92 - power { 92 + key-power { 93 93 label = "Power Button"; 94 94 gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; 95 95 linux,code = <KEY_POWER>;
+3 -3
arch/arm/boot/dts/imx6q-var-dt6customboard.dts
··· 28 28 compatible = "gpio-keys"; 29 29 autorepeat; 30 30 31 - back { 31 + key-back { 32 32 gpios = <&gpio4 26 GPIO_ACTIVE_LOW>; 33 33 linux,code = <KEY_BACK>; 34 34 label = "Key Back"; ··· 37 37 wakeup-source; 38 38 }; 39 39 40 - home { 40 + key-home { 41 41 gpios = <&gpio5 11 GPIO_ACTIVE_LOW>; 42 42 linux,code = <KEY_HOME>; 43 43 label = "Key Home"; ··· 46 46 wakeup-source; 47 47 }; 48 48 49 - menu { 49 + key-menu { 50 50 gpios = <&gpio4 25 GPIO_ACTIVE_LOW>; 51 51 linux,code = <KEY_MENU>; 52 52 label = "Key Menu";
+2 -2
arch/arm/boot/dts/imx7d-sdb.dts
··· 24 24 pinctrl-names = "default"; 25 25 pinctrl-0 = <&pinctrl_gpio_keys>; 26 26 27 - volume-up { 27 + key-volume-up { 28 28 label = "Volume Up"; 29 29 gpios = <&gpio5 11 GPIO_ACTIVE_LOW>; 30 30 linux,code = <KEY_VOLUMEUP>; 31 31 wakeup-source; 32 32 }; 33 33 34 - volume-down { 34 + key-volume-down { 35 35 label = "Volume Down"; 36 36 gpios = <&gpio5 10 GPIO_ACTIVE_LOW>; 37 37 linux,code = <KEY_VOLUMEDOWN>;