ARM: dts: marvell: kirkwood: align GPIO keys node name with bindings

Bindings expect the GPIO key node names to follow certain pattern, see
dtbs_check warnings:

  kirkwood-laplug.dtb: gpio_keys: 'power' does not match any of the regexes: '^(button|event|key|switch|(button|event|key|switch)...

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts b/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts
index 07fbfca444d5a37c0aff489c7645caf9b70d0f92..f34c3897ff48b84c7f00e7468b5cb724aa3d3069 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts
@@ -35,13 +35,13 @@
        gpio_keys {
                compatible = "gpio-keys";
 
-               reset {
+               button-reset {
                        label = "Reset";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                };
 
-               button {
+               button-power {
                        label = "Power";
                        linux,code = <KEY_SLEEP>;
                        gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts b/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts
index f59ff7578dfcd48f9afa78258dcfa86bfbddbfb3..7e3ee64d4bdf8c98815d463ea4d31ad2e1ee2599 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts
@@ -29,25 +29,25 @@
                pinctrl-0 = <&pmx_buttons>;
                pinctrl-names = "default";
 
-               power {
+               button-power {
                        label = "Power Button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
                };
 
-               reset {
+               button-reset {
                        label = "Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
                };
 
-               usb1 {
+               button-usb1 {
                        label = "USB1 Button";
                        linux,code = <BTN_0>;
                        gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
                };
 
-               usb2 {
+               button-usb2 {
                        label = "USB2 Button";
                        linux,code = <BTN_1>;
                        gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts
index 448b0cd23b5f146ab6779f259f745934b0bebee7..2582b84d8415b4e76f9041433dc20b49b724b755 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts
@@ -61,7 +61,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               power {
+               key-power {
                        label = "Power push button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts
index 0c0851cd9bece47492e3aea39534f8012809a171..e8eff0ba1c9980b3772f3d57aa5162da1456a84a 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts
@@ -179,12 +179,12 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               reset {
+               button-reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
                };
-               wps {
+               button-wps {
                        label = "wps";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
index 0738eb679fcd7af8483b6a486237eb0f115e0396..baea14c68520034f495e7cad4cb7f0cfc4baff17 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
@@ -14,17 +14,17 @@
                             &pmx_button_reset>;
                pinctrl-names = "default";
 
-               power {
+               button-power {
                        label = "Power button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
                };
-               eject {
+               button-eject {
                        label = "USB unmount button";
                        linux,code = <KEY_EJECTCD>;
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
-               reset {
+               button-reset {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts
index 962a910a6f5ca63703ffac5ee85eba1f6078060a..d76dbbce16f17055d26fa39f1d928498298c72dd 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts
@@ -63,12 +63,12 @@
                pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>;
                pinctrl-names = "default";
 
-               copy {
+               button-copy {
                        label = "USB Copy";
                        linux,code = <KEY_COPY>;
                        gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
                };
-               reset {
+               button-reset {
                        label = "Reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts
index aed20185fd7ab10467bf858b555f3bf14659a977..ea98ff13700e790722410528eb016c613ced8b1a 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts
@@ -127,13 +127,13 @@
                pinctrl-0 = < &pmx_button_reset &pmx_button_otb >;
                pinctrl-names = "default";
 
-               otb {
+               button-otb {
                        label = "OTB Button";
                        linux,code = <KEY_COPY>;
                        gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
                        debounce-interval = <100>;
                };
-               reset {
+               button-reset {
                        label = "Reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts
index 2338f495d5172e1ed29f018894140ac1bd72d500..fa7ace071de8afb59ddc4238ace081cbe81cb61b 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts
@@ -154,17 +154,17 @@
                pinctrl-names = "default";
 
 
-               Power {
+               button-power {
                        label = "Power Button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
-               Reset {
+               button-reset {
                        label = "Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
-               OTB {
+               button-otb {
                        label = "OTB Button";
                        linux,code = <KEY_COPY>;
                        gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-l-50.dts b/arch/arm/boot/dts/marvell/kirkwood-l-50.dts
index c841eb8e7fb1d0404301f4f8b21899fb60b77a25..094854743dded66af44a1156fe178ef3dd62e9f0 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-l-50.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-l-50.dts
@@ -193,7 +193,7 @@
        keys {
                compatible = "gpio-keys";
 
-               factory_defaults {
+               button-factory-defaults {
                        label = "factory_defaults";
                        gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-laplug.dts b/arch/arm/boot/dts/marvell/kirkwood-laplug.dts
index 8c2b540eaf4ffd1c8a460f6e04343aa95f48c60a..8296486a5931f284248808d2d8fc0383b5e34100 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-laplug.dts
@@ -51,7 +51,7 @@
        gpio_keys {
                compatible = "gpio-keys";
 
-               power {
+               button-power {
                        label = "Power push button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts
index 27fd6e2337d555e5d0fbcac18d8e1dd7f888d082..3f97240fda74697ca403d211f8832d767c871742 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts
@@ -38,13 +38,13 @@
                pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >;
                pinctrl-names = "default";
 
-               wps {
+               button-wps {
                        label = "WPS Button";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
 
-               reset {
+               button-reset {
                        label = "Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
index f80af24b9e9008a59460276642627553b1cf46a8..a86dbc49060069a764d523c76dc9d998e38c5082 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
@@ -113,18 +113,18 @@
                             &pmx_power_auto_switch>;
                pinctrl-names = "default";
 
-               option {
+               button-option {
                        label = "Function Button";
                        linux,code = <KEY_OPTION>;
                        gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
                };
-               reserved {
+               button-reserved {
                        label = "Power-on Switch";
                        linux,code = <KEY_RESERVED>;
                        linux,input-type = <5>;
                        gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
                };
-               power {
+               button-power {
                        label = "Power-auto Switch";
                        linux,code = <KEY_ESC>;
                        linux,input-type = <5>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts
index 5a77286136c7293c56edcd222c2a29e72c7a171d..0d5d85c873b5608d284cad75034a413d1cbd337f 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts
@@ -96,12 +96,12 @@
                pinctrl-0 = <&pmx_keys>;
                pinctrl-names = "default";
 
-               restart {
+               button-restart {
                        label = "SWR Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
-               wps {
+               button-wps {
                        label = "WPS Button";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi
index b5737026e244dafe25bef6692381c2980b8666d5..d0f85893aecacbb6cb75795f46a4edd344dd1738 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi
@@ -60,19 +60,19 @@
                 * esc and power represent a three position rocker
                 * switch. Thus the conventional KEY_POWER does not fit
                 */
-               exc {
+               button-exc {
                        label = "Back power switch (on|auto)";
                        linux,code = <KEY_ESC>;
                        linux,input-type = <5>;
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
-               power {
+               button-power {
                        label = "Back power switch (auto|off)";
                        linux,code = <KEY_1>;
                        linux,input-type = <5>;
                        gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
                };
-               option {
+               button-option {
                        label = "Function button";
                        linux,code = <KEY_OPTION>;
                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi
index 51530ea86622af05fc09eaa993e52c6dd9918aad..6cc068a05673071278af44f86ff5857e012528af 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi
@@ -58,7 +58,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               power {
+               button-power {
                        label = "Power push button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts
index 49da633a1bc02d210196cf4b4db765b48f0c3972..767f34ab434eb1821068608e0582eb1332a72152 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts
@@ -40,19 +40,19 @@
                pinctrl-0 = <&pmx_buttons>;
                pinctrl-names = "default";
 
-               power {
+               button-power {
                        label = "Power Button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
                };
 
-               copy {
+               button-copy {
                        label = "Copy Button";
                        linux,code = <KEY_COPY>;
                        gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
                };
 
-               reset {
+               button-reset {
                        label = "Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi
index ea3d36512e9f3c1d30c08c495abd77e68d732a47..bdce8a86ce5187e64f4be95c458d8169b72de5fc 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi
@@ -68,17 +68,17 @@
                pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
                pinctrl-names = "default";
 
-               power {
+               button-power {
                        label = "Power Button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
                };
-               copy {
+               button-copy {
                        label = "Copy Button";
                        linux,code = <KEY_COPY>;
                        gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
                };
-               reset {
+               button-reset {
                        label = "Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts
index 8ea430168ea54952cc9219df0e24817be577b5a9..ef6d6d7a4008ad8a201a0063d1fcbc86953d1064 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts
@@ -118,7 +118,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               power {
+               button-power {
                        label = "Init Button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts
index 5aa4669ae2548a8cf71b836a82cf4671f3d4b83c..601760041c9998bfa9ad59ce54e3e66b25eaa17d 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts
@@ -34,7 +34,7 @@
                pinctrl-0 = <&pmx_button_eject>;
                pinctrl-names = "default";
 
-               eject {
+               button-eject {
                        debounce-interval = <50>;
                        wakeup-source;
                        linux,code = <KEY_EJECTCD>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-t5325.dts b/arch/arm/boot/dts/marvell/kirkwood-t5325.dts
index ad093324e075a4f6748417884238718629e1b820..6703e412c8e22f068d91a78265c55d836835885a 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-t5325.dts
@@ -161,7 +161,7 @@
                pinctrl-0 = <&pmx_button_power>;
                pinctrl-names = "default";
 
-               power {
+               button-power {
                        label = "Power Button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts
index 30892c19aceb82d4ccf5b63e0a3120eb06e90bc4..859521b5b84ec7a525fe61f1fb1c250aeecf97f1 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts
@@ -40,12 +40,12 @@
                pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
                pinctrl-names = "default";
 
-               copy {
+               button-copy {
                        label = "USB Copy";
                        linux,code = <KEY_COPY>;
                        gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
                };
-               reset {
+               button-reset {
                        label = "Reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts
index aba1205981f1ef91a12c3187bb5979311599024a..3b0a4ed588e8387a65450bdab296b841c4d38caf 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts
@@ -40,12 +40,12 @@
                pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
                pinctrl-names = "default";
 
-               copy {
+               button-copy {
                        label = "USB Copy";
                        linux,code = <KEY_COPY>;
                        gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
                };
-               reset {
+               button-reset {
                        label = "Reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi b/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi
index 717236853e4585d2b8b49f31e850a4aec6bf3e76..126db753c8fe1d004051e6904dd8be4a4d73c18c 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi
@@ -41,12 +41,12 @@
                pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
                pinctrl-names = "default";
 
-               copy {
+               button-copy {
                        label = "USB Copy";
                        linux,code = <KEY_COPY>;
                        gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
                };
-               reset {
+               button-reset {
                        label = "Reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;