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

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

  orion5x-lacie-d2-network.dtb: gpio-keys: 'front_button', 'power_rocker_sw_off', 'power_rocker_sw_on' do not match any of the regexes: '^(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/orion5x-lacie-d2-network.dts b/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts
index 03471d30bfd9524a65cf52eb305577000aa9f51e..3d6c5af0e8435a37dc058746895e8c381972b74b 100644 (file)
--- a/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts
+++ b/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts
@@ -37,20 +37,21 @@
                pinctrl-names = "default";
                #address-cells = <1>;
                #size-cells = <0>;
-               front_button {
+
+               button-front {
                        label = "Front Push Button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;
                };
 
-               power_rocker_sw_on {
+               switch-power-rocker-sw-on {
                        label = "Power rocker switch (on|auto)";
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <1>; /* D2NET_SWITCH_POWER_ON */
                        gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
                };
 
-               power_rocker_sw_off {
+               switch-power-rocker-sw-off {
                        label = "Power rocker switch (auto|off)";
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <2>; /* D2NET_SWITCH_POWER_OFF */

diff --git a/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts b/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts
index ee751995c8d0bfbcb85e802e77c3fc8811398575..624b737a8be4ba2a3c646708932eb8dd6bdc93b0 100644 (file)
--- a/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts
+++ b/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts
@@ -61,7 +61,7 @@
        };
 
        gpio_keys {
-               func {
+               func-button {
                        label = "Function Button";
                        linux,code = <KEY_OPTION>;
                        gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts
index 2fbc17d6dfa4cd7536e842d7884eff842aaa6b5e..e2829fb0c8b2885109869f56b16448a53a66e88a 100644 (file)
--- a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts
+++ b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts
@@ -76,20 +76,21 @@
                pinctrl-names = "default";
                #address-cells = <1>;
                #size-cells = <0>;
-               func {
+
+               key-func {
                        label = "Function Button";
                        linux,code = <KEY_OPTION>;
                        gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
                };
 
-               power {
+               key-power {
                        label = "Power-on Switch";
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <KEY_RESERVED>; /* LSMINI_SW_POWER */
                        gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
                };
 
-               autopower {
+               key-autopower {
                        label = "Power-auto Switch";
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <KEY_ESC>; /* LSMINI_SW_AUTOPOWER */

diff --git a/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts b/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts
index d57859998350d622f77d629492c626baa845e956..90ce5fa883a44b7b2a1cc42f968a032f48939321 100644 (file)
--- a/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts
+++ b/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts
@@ -37,13 +37,14 @@
                pinctrl-names = "default";
                #address-cells = <1>;
                #size-cells = <0>;
-               power {
+
+               key-power {
                        label = "Power";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
 
-               reset {
+               key-reset {
                        label = "Reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts b/arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts
index fb203e7d37f5e39e0654f60e27c832ef91b932e3..d63ea15539aab1157a54981aec3977d2bbdca471 100644 (file)
--- a/arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts
+++ b/arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts
@@ -35,7 +35,7 @@
                pinctrl-0 = <&pmx_reset_button>;
                pinctrl-names = "default";
 
-               reset {
+               key-reset {
                        label = "Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;