ARM: dts: armada-370-xp: Remove button address and fixup names

The gpio-key nodes do not have a reg property, so remove the address from
the unit name.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index e2ba4bd52ecf1add967ce60c258a13d70c90199f..c3fd6e49212ff5edea6df2f521bf2f527d7e9d66 100644 (file)
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -122,7 +122,7 @@
                                compatible = "gpio-keys";
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               button@1 {
+                               button {
                                        label = "Software Button";
                                        linux,code = <KEY_POWER>;
                                        gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
index 4aec32c9b6dfefa7ff65b61ced8d12ab52f16014..e9a5b952afc08db906d1def5814ce1c7d5d026c0 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
@@ -141,19 +141,19 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               button@1 {
+               power {
                        label = "Power button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
                        debounce-interval = <100>;
                };
-               button@2 {
+               backup {
                        label = "Backup button";
                        linux,code = <KEY_OPTION>;
                        gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
                        debounce-interval = <100>;
                };
-               button@3 {
+               reset {
                        label = "Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
index 75ad77b26a47070b9798d486bc9c07af3bc212da..d079a89ee5a290b021dfe413f21dc8c7c959a08e 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
@@ -89,19 +89,19 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               button@1 {
+               power {
                        label = "Power button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
                        debounce-interval = <100>;
                };
-               button@2 {
+               reset {
                        label = "Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
                        debounce-interval = <100>;
                };
-               button@3 {
+               button {
                        label = "USB VBUS error";
                        linux,code = <KEY_UNKNOWN>;
                        gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index e7b306ad84e84db8f47b5e7603d5c057dfab3e8f..1e1fc4fccbadab268569c1aa5e4bed44cdd3102b 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -113,7 +113,7 @@
                pinctrl-0 = <&keys_pin>;
                pinctrl-names = "default";
 
-               button@1 {
+               reset {
                        label = "Factory Reset Button";
                        linux,code = <KEY_SETUP>;
                        gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index 7c8cd7b450e5a7171cdbb3d1a508bed2ab2413bb..83ac884c0f8ae52fc2f564bfcf2cc31c68c1f7e2 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -267,13 +267,13 @@
                pinctrl-0 = <&keys_pin>;
                pinctrl-names = "default";
 
-               button@1 {
+               wps {
                        label = "WPS";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
                };
 
-               button@2 {
+               reset {
                        label = "Factory Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 8a14b32c70e13a518c3db1286ab769f2c55f18dc..b577c9fb03a45aa2f0f256ca90fab4b16a67a56e 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -139,7 +139,7 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
 
-                               button@1 {
+                               init {
                                        label = "Init Button";
                                        linux,code = <KEY_POWER>;
                                        gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;