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>

diff --git a/arch/arm/boot/dts/imx23-xfi3.dts b/arch/arm/boot/dts/imx23-xfi3.dts
index a6213c590f9469eba50cc9dc1ac0677d59d8dc5e..b1d8210f3ecc84e7654f7168bc3ddddba2693a9e 100644 (file)
--- a/arch/arm/boot/dts/imx23-xfi3.dts
+++ b/arch/arm/boot/dts/imx23-xfi3.dts
@@ -158,19 +158,19 @@
                default-brightness-level = <6>;
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
                pinctrl-names = "default";
                pinctrl-0 = <&key_pins_a>;
 
-               voldown {
+               key-voldown {
                        label = "volume-down";
                        linux,code = <114>;
                        gpios = <&gpio2 7 0>;
                        debounce-interval = <20>;
                };
 
-               volup {
+               key-volup {
                        label = "volume-up";
                        linux,code = <115>;
                        gpios = <&gpio2 8 0>;

diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
index 3f38c2e60a745af37743022b4de671849e6efb11..c7207ea437c404399213b2f4939af22159e1ea68 100644 (file)
--- a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
+++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
@@ -13,12 +13,12 @@
        model = "Eukrea MBIMXSD25";
        compatible = "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25";
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpiokeys>;
 
-               bp1 {
+               button {
                        label = "BP1";
                        gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_MISC>;

diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index ff1b450c0717d69f7e1ee9d05e4cfb0b66ccd148..9ef0d567ea480599d834c8cd0fa7d11a6c12c41b 100644 (file)
--- a/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -388,12 +388,12 @@
                };
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
                pinctrl-names = "default";
                pinctrl-0 = <&rotary_btn_pins_cfa10049>;
 
-               rotary_button {
+               rotary-button {
                        label = "rotary_button";
                        gpios = <&gpio3 26 1>;
                        debounce-interval = <10>;

diff --git a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
index bacb846f99e3c48da88ed2dfca668782b638ca0d..73f521c46c1eed0192fd48dcdc9b6ce89b371e2b 100644 (file)
--- a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
@@ -204,7 +204,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&enocean_button>;
 
-               enocean {
+               key-enocean {
                        label = "EnOcean";
                        linux,code = <KEY_NEW>;
                        gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi b/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
index 3280fddaaf0dea9c8e3d8b9403c9bf548f7d789f..b285a946e2c2a5983cc72b79347b532993845005 100644 (file)
--- a/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
+++ b/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
@@ -19,12 +19,12 @@
                default-brightness-level = <10>;
        };
 
-       button-sw3 {
+       gpio-keys-0 {
                compatible = "gpio-keys";
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_button_sw3_pins_mbmx28lc>;
 
-               sw3 {
+               switch-sw3 {
                        label = "SW3";
                        gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_MISC>;
@@ -32,12 +32,12 @@
                };
        };
 
-       button-sw4 {
+       gpio-keys-1 {
                compatible = "gpio-keys";
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_button_sw4_pins_mbmx28lc>;
 
-               sw4 {
+               switch-sw4 {
                        label = "SW4";
                        gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_MISC>;

diff --git a/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts b/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
index b1c11170ac25a86824e160f9a40f8389053dca0b..7f4f812b08111a35881a0278949872c28fa79cf4 100644 (file)
--- a/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
+++ b/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
@@ -13,12 +13,12 @@
        model = "Eukrea CPUIMX35";
        compatible = "eukrea,mbimxsd35-baseboard", "eukrea,cpuimx35", "fsl,imx35";
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_bp1>;
 
-               bp1 {
+               button {
                        label = "BP1";
                        gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_MISC>;

diff --git a/arch/arm/boot/dts/imx50-kobo-aura.dts b/arch/arm/boot/dts/imx50-kobo-aura.dts
index 82ce8c43be867efac9f21dd3c73b6960896e099d..51bf6117fb124078e3a0494c1f1a14f73aaafdef 100644 (file)
--- a/arch/arm/boot/dts/imx50-kobo-aura.dts
+++ b/arch/arm/boot/dts/imx50-kobo-aura.dts
@@ -38,20 +38,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpiokeys>;
 
-               power {
+               key-power {
                        label = "Power Button";
                        gpios = <&gpio4 10 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                };
 
-               hallsensor {
+               event-hallsensor {
                        label = "Hallsensor";
                        gpios = <&gpio5 15 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESERVED>;
                        linux,input-type = <EV_SW>;
                };
 
-               frontlight {
+               event-frontlight {
                        label = "Frontlight";
                        gpios = <&gpio4 1 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_DISPLAYTOGGLE>;

diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 552196d8a60a73da762f8a06b578ecc1d67d14c2..a1f9c6a722752f0b660db27cd42c66ad705748c4 100644 (file)
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -154,7 +154,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_keys>;
 
-               power {
+               key-power {
                        label = "Power Button";
                        gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_POWER>;

diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index 6208fbb2e74104fb13fdd896b22b6d81d997f0aa..23a7492e29294ebadb7407467afc3d087ef23e07 100644 (file)
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -61,34 +61,34 @@
        gpio-keys {
                compatible = "gpio-keys";
 
-               home {
+               key-home {
                        label = "Home";
                        gpios = <&gpio5 10 0>;
                        linux,code = <KEY_HOME>;
                        wakeup-source;
                };
 
-               back {
+               key-back {
                        label = "Back";
                        gpios = <&gpio5 11 0>;
                        linux,code = <KEY_BACK>;
                        wakeup-source;
                };
 
-               program {
+               key-program {
                        label = "Program";
                        gpios = <&gpio5 12 0>;
                        linux,code = <KEY_PROGRAM >;
                        wakeup-source;
                };
 
-               volume-up {
+               key-volume-up {
                        label = "Volume Up";
                        gpios = <&gpio5 13 0>;
                        linux,code = <KEY_VOLUMEUP>;
                };
 
-               volume-down {
+               key-volume-down {
                        label = "Volume Down";
                        gpios = <&gpio4 0 0>;
                        linux,code = <KEY_VOLUMEDOWN>;

diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index d6a87c0c2934911f26d12bb7bdcbf08b3ab3130c..50fef8dd3675b6aed61a94b90dc89b50b19d3be1 100644 (file)
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -45,20 +45,20 @@
        gpio-keys {
                compatible = "gpio-keys";
 
-               power {
+               key-power {
                        label = "Power Button";
                        gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                };
 
-               volume-up {
+               key-volume-up {
                        label = "Volume Up";
                        gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                        wakeup-source;
                };
 
-               volume-down {
+               key-volume-down {
                        label = "Volume Down";
                        gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEDOWN>;

diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index 9be44e80718865ee72cdf1ff9f1be49db2f333c4..f8d17967a67ef6e76ea8a4e526b153b89ddbd68c 100644 (file)
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -19,13 +19,13 @@
        gpio-keys {
                compatible = "gpio-keys";
 
-               volume-up {
+               key-volume-up {
                        label = "Volume Up";
                        gpios = <&gpio2 14 0>;
                        linux,code = <KEY_VOLUMEUP>;
                };
 
-               volume-down {
+               key-volume-down {
                        label = "Volume Down";
                        gpios = <&gpio2 15 0>;
                        linux,code = <KEY_VOLUMEDOWN>;

diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index 8712e985146543318d1f3fafe2e9804dd033c51d..892dd1a4bac352f4f55517cf62a758c6e543e9ca 100644 (file)
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -81,7 +81,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_key>;
 
-               power {
+               key-power {
                        label = "Power Button";
                        gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
                        linux,code = <116>; /* KEY_POWER */

diff --git a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
index d9de9b4f0c52348300ea2abdc83e5e12eff9ec5d..d477a937b47a8ba8edc619879ace604bc248d4cc 100644 (file)
--- a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
+++ b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
@@ -6,7 +6,7 @@
        keyboard {
                compatible = "gpio-keys";
 
-               btn0 {
+               button-0 {
                        gpios = <&pcf8575 0 GPIO_ACTIVE_LOW>;
                        label = "btn0";
                        linux,code = <KEY_WAKEUP>;
@@ -14,7 +14,7 @@
                        wakeup-source;
                };
 
-               btn1 {
+               button-1 {
                        gpios = <&pcf8575 1 GPIO_ACTIVE_LOW>;
                        label = "btn1";
                        linux,code = <KEY_WAKEUP>;
@@ -22,7 +22,7 @@
                        wakeup-source;
                };
 
-               btn2 {
+               button-2 {
                        gpios = <&pcf8575 2 GPIO_ACTIVE_LOW>;
                        label = "btn2";
                        linux,code = <KEY_WAKEUP>;
@@ -30,7 +30,7 @@
                        wakeup-source;
                };
 
-               btn3 {
+               button-3 {
                        gpios = <&pcf8575 3 GPIO_ACTIVE_LOW>;
                        label = "btn3";
                        linux,code = <KEY_WAKEUP>;

diff --git a/arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi b/arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi
index ec5b664531565a635ffec22a201f474245ca4e54..337db29b0010a9598dd0a45f3c270b32b5c4920d 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi
+++ b/arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi
@@ -188,7 +188,7 @@
        rotary-encoder-key {
                compatible = "gpio-keys";
 
-               rotary-encoder-press {
+               rotary-encoder-event {
                        label = "rotary-encoder press";
                        gpios = <&tca6424a 0 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_ENTER>;

diff --git a/arch/arm/boot/dts/imx6dl-prtmvt.dts b/arch/arm/boot/dts/imx6dl-prtmvt.dts
index a35a1c66e7706cbd3bd6e91f3ab21d50e721e558..1f8cddd83ccb50625c38e610748df5006dafc2a7 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-prtmvt.dts
+++ b/arch/arm/boot/dts/imx6dl-prtmvt.dts
@@ -51,98 +51,98 @@
                pinctrl-0 = <&pinctrl_gpiokeys>;
                autorepeat;
 
-               power {
+               key-power {
                        label = "Power Button";
                        gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        wakeup-source;
                };
 
-               f1 {
+               key-f1 {
                        label = "GPIO Key F1";
                        linux,code = <KEY_F1>;
                        gpios = <&gpio_pca 0 GPIO_ACTIVE_LOW>;
                };
 
-               f2 {
+               key-f2 {
                        label = "GPIO Key F2";
                        linux,code = <KEY_F2>;
                        gpios = <&gpio_pca 1 GPIO_ACTIVE_LOW>;
                };
 
-               f3 {
+               key-f3 {
                        label = "GPIO Key F3";
                        linux,code = <KEY_F3>;
                        gpios = <&gpio_pca 2 GPIO_ACTIVE_LOW>;
                };
 
-               f4 {
+               key-f4 {
                        label = "GPIO Key F4";
                        linux,code = <KEY_F4>;
                        gpios = <&gpio_pca 3 GPIO_ACTIVE_LOW>;
                };
 
-               f5 {
+               key-f5 {
                        label = "GPIO Key F5";
                        linux,code = <KEY_F5>;
                        gpios = <&gpio_pca 4 GPIO_ACTIVE_LOW>;
                };
 
-               cycle {
+               key-cycle {
                        label = "GPIO Key CYCLE";
                        linux,code = <KEY_CYCLEWINDOWS>;
                        gpios = <&gpio_pca 5 GPIO_ACTIVE_LOW>;
                };
 
-               esc {
+               key-esc {
                        label = "GPIO Key ESC";
                        linux,code = <KEY_ESC>;
                        gpios = <&gpio_pca 6 GPIO_ACTIVE_LOW>;
                };
 
-               up {
+               key-up {
                        label = "GPIO Key UP";
                        linux,code = <KEY_UP>;
                        gpios = <&gpio_pca 7 GPIO_ACTIVE_LOW>;
                };
 
-               down {
+               key-down {
                        label = "GPIO Key DOWN";
                        linux,code = <KEY_DOWN>;
                        gpios = <&gpio_pca 8 GPIO_ACTIVE_LOW>;
                };
 
-               ok {
+               key-ok {
                        label = "GPIO Key OK";
                        linux,code = <KEY_OK>;
                        gpios = <&gpio_pca 9 GPIO_ACTIVE_LOW>;
                };
 
-               f6 {
+               key-f6 {
                        label = "GPIO Key F6";
                        linux,code = <KEY_F6>;
                        gpios = <&gpio_pca 10 GPIO_ACTIVE_LOW>;
                };
 
-               f7 {
+               key-f7 {
                        label = "GPIO Key F7";
                        linux,code = <KEY_F7>;
                        gpios = <&gpio_pca 11 GPIO_ACTIVE_LOW>;
                };
 
-               f8 {
+               key-f8 {
                        label = "GPIO Key F8";
                        linux,code = <KEY_F8>;
                        gpios = <&gpio_pca 12 GPIO_ACTIVE_LOW>;
                };
 
-               f9 {
+               key-f9 {
                        label = "GPIO Key F9";
                        linux,code = <KEY_F9>;
                        gpios = <&gpio_pca 13 GPIO_ACTIVE_LOW>;
                };
 
-               f10 {
+               key-f10 {
                        label = "GPIO Key F10";
                        linux,code = <KEY_F10>;
                        gpios = <&gpio_pca 14 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/imx6dl-prtvt7.dts b/arch/arm/boot/dts/imx6dl-prtvt7.dts
index 0a0b7acddfb2369105f4c7cf0446a2a793a400f3..a1eb53851794ac5269543fdbcf9a8c0dd23d95a3 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-prtvt7.dts
+++ b/arch/arm/boot/dts/imx6dl-prtvt7.dts
@@ -62,91 +62,91 @@
                compatible = "gpio-keys";
                autorepeat;
 
-               esc {
+               key-esc {
                        label = "GPIO Key ESC";
                        linux,code = <KEY_ESC>;
                        gpios = <&gpio_pca 0 GPIO_ACTIVE_LOW>;
                };
 
-               up {
+               key-up {
                        label = "GPIO Key UP";
                        linux,code = <KEY_UP>;
                        gpios = <&gpio_pca 1 GPIO_ACTIVE_LOW>;
                };
 
-               down {
+               key-down {
                        label = "GPIO Key DOWN";
                        linux,code = <KEY_DOWN>;
                        gpios = <&gpio_pca 4 GPIO_ACTIVE_LOW>;
                };
 
-               enter {
+               key-enter {
                        label = "GPIO Key Enter";
                        linux,code = <KEY_ENTER>;
                        gpios = <&gpio_pca 3 GPIO_ACTIVE_LOW>;
                };
 
-               cycle {
+               key-cycle {
                        label = "GPIO Key CYCLE";
                        linux,code = <KEY_CYCLEWINDOWS>;
                        gpios = <&gpio_pca 2 GPIO_ACTIVE_LOW>;
                };
 
-               f1 {
+               key-f1 {
                        label = "GPIO Key F1";
                        linux,code = <KEY_F1>;
                        gpios = <&gpio_pca 14 GPIO_ACTIVE_LOW>;
                };
 
-               f2 {
+               key-f2 {
                        label = "GPIO Key F2";
                        linux,code = <KEY_F2>;
                        gpios = <&gpio_pca 13 GPIO_ACTIVE_LOW>;
                };
 
-               f3 {
+               key-f3 {
                        label = "GPIO Key F3";
                        linux,code = <KEY_F3>;
                        gpios = <&gpio_pca 12 GPIO_ACTIVE_LOW>;
                };
 
-               f4 {
+               key-f4 {
                        label = "GPIO Key F4";
                        linux,code = <KEY_F4>;
                        gpios = <&gpio_pca 11 GPIO_ACTIVE_LOW>;
                };
 
-               f5 {
+               key-f5 {
                        label = "GPIO Key F5";
                        linux,code = <KEY_F5>;
                        gpios = <&gpio_pca 10 GPIO_ACTIVE_LOW>;
                };
 
-               f6 {
+               key-f6 {
                        label = "GPIO Key F6";
                        linux,code = <KEY_F6>;
                        gpios = <&gpio_pca 5 GPIO_ACTIVE_LOW>;
                };
 
-               f7 {
+               key-f7 {
                        label = "GPIO Key F7";
                        linux,code = <KEY_F7>;
                        gpios = <&gpio_pca 6 GPIO_ACTIVE_LOW>;
                };
 
-               f8 {
+               key-f8 {
                        label = "GPIO Key F8";
                        linux,code = <KEY_F8>;
                        gpios = <&gpio_pca 7 GPIO_ACTIVE_LOW>;
                };
 
-               f9 {
+               key-f9 {
                        label = "GPIO Key F9";
                        linux,code = <KEY_F9>;
                        gpios = <&gpio_pca 8 GPIO_ACTIVE_LOW>;
                };
 
-               f10 {
+               key-f10 {
                        label = "GPIO Key F10";
                        linux,code = <KEY_F10>;
                        gpios = <&gpio_pca 9 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
index 779b52858a25337f0070e5c6e4829fabed48d834..72df1dba83bec640b511fbf3763239193428d1f6 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-victgo.dts
+++ b/arch/arm/boot/dts/imx6dl-victgo.dts
@@ -18,14 +18,14 @@
                pinctrl-0 = <&pinctrl_gpiokeys>;
                autorepeat;
 
-               power {
+               key-power {
                        label = "Power Button";
                        gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        wakeup-source;
                };
 
-               enter {
+               key-enter {
                        label = "Rotary Key";
                        gpios = <&gpio2 05 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_ENTER>;

diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts
index f8a8dd3e069f4703bb1253d41e3abced371e363a..ee8c0bd3ecfd525739da152e564a5be3235ab46e 100644 (file)
--- a/arch/arm/boot/dts/imx6q-novena.dts
+++ b/arch/arm/boot/dts/imx6q-novena.dts
@@ -86,7 +86,7 @@
                        linux,code = <KEY_POWER>;
                };
 
-               lid {
+               lid-event {
                        label = "Lid";
                        gpios = <&gpio4 12 GPIO_ACTIVE_LOW>;
                        linux,input-type = <5>; /* EV_SW */

diff --git a/arch/arm/boot/dts/imx6q-pistachio.dts b/arch/arm/boot/dts/imx6q-pistachio.dts
index 7a33e54cc0f1420c93fdf24da37dd7d280a24a1a..bad8d831e64e6f796b8f1b109e8d20df701982ec 100644 (file)
--- a/arch/arm/boot/dts/imx6q-pistachio.dts
+++ b/arch/arm/boot/dts/imx6q-pistachio.dts
@@ -100,7 +100,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_keys>;
 
-               power {
+               key-power {
                        label = "Power Button";
                        gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
                        wakeup-source;

diff --git a/arch/arm/boot/dts/imx6q-utilite-pro.dts b/arch/arm/boot/dts/imx6q-utilite-pro.dts
index d16ff2083d626c465cc0fad79b640b92152dd703..ad59b23ef27a084b80015e53c9cb5588dfc74b9a 100644 (file)
--- a/arch/arm/boot/dts/imx6q-utilite-pro.dts
+++ b/arch/arm/boot/dts/imx6q-utilite-pro.dts
@@ -89,7 +89,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_keys>;
 
-               power {
+               key-power {
                        label = "Power Button";
                        gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;

diff --git a/arch/arm/boot/dts/imx6q-var-dt6customboard.dts b/arch/arm/boot/dts/imx6q-var-dt6customboard.dts
index 63550351340da51e3ccfe17e1619e09918accca0..2290c1237634d9d77e8e99ead95648e3a6db3ac2 100644 (file)
--- a/arch/arm/boot/dts/imx6q-var-dt6customboard.dts
+++ b/arch/arm/boot/dts/imx6q-var-dt6customboard.dts
@@ -28,7 +28,7 @@
                compatible = "gpio-keys";
                autorepeat;
 
-               back {
+               key-back {
                        gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_BACK>;
                        label = "Key Back";
@@ -37,7 +37,7 @@
                        wakeup-source;
                };
 
-               home {
+               key-home {
                        gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_HOME>;
                        label = "Key Home";
@@ -46,7 +46,7 @@
                        wakeup-source;
                };
 
-               menu {
+               key-menu {
                        gpios = <&gpio4 25 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_MENU>;
                        label = "Key Menu";

diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index 2b8f4248053b8a8cf61fa6aaf0f1acc2ec0e9577..f483bc0afe5ea75f8235f32ce8c06a60ba4e0eec 100644 (file)
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -24,14 +24,14 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_keys>;
 
-               volume-up {
+               key-volume-up {
                        label = "Volume Up";
                        gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                        wakeup-source;
                };
 
-               volume-down {
+               key-volume-down {
                        label = "Volume Down";
                        gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEDOWN>;