瀏覽代碼

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>
Gregory CLEMENT 8 年之前
父節點
當前提交
9e622af05c

+ 1 - 1
arch/arm/boot/dts/armada-370-rd.dts

@@ -122,7 +122,7 @@
 				compatible = "gpio-keys";
 				compatible = "gpio-keys";
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <0>;
 				#size-cells = <0>;
-				button@1 {
+				button {
 					label = "Software Button";
 					label = "Software Button";
 					linux,code = <KEY_POWER>;
 					linux,code = <KEY_POWER>;
 					gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
 					gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

+ 3 - 3
arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi

@@ -141,19 +141,19 @@
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 		#size-cells = <0>;
 
 
-		button@1 {
+		power {
 			label = "Power button";
 			label = "Power button";
 			linux,code = <KEY_POWER>;
 			linux,code = <KEY_POWER>;
 			gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
 			gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
 			debounce-interval = <100>;
 			debounce-interval = <100>;
 		};
 		};
-		button@2 {
+		backup {
 			label = "Backup button";
 			label = "Backup button";
 			linux,code = <KEY_OPTION>;
 			linux,code = <KEY_OPTION>;
 			gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
 			gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
 			debounce-interval = <100>;
 			debounce-interval = <100>;
 		};
 		};
-		button@3 {
+		reset {
 			label = "Reset Button";
 			label = "Reset Button";
 			linux,code = <KEY_RESTART>;
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
 			gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;

+ 3 - 3
arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi

@@ -89,19 +89,19 @@
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 		#size-cells = <0>;
 
 
-		button@1 {
+		power {
 			label = "Power button";
 			label = "Power button";
 			linux,code = <KEY_POWER>;
 			linux,code = <KEY_POWER>;
 			gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
 			gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
 			debounce-interval = <100>;
 			debounce-interval = <100>;
 		};
 		};
-		button@2 {
+		reset {
 			label = "Reset Button";
 			label = "Reset Button";
 			linux,code = <KEY_RESTART>;
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
 			gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
 			debounce-interval = <100>;
 			debounce-interval = <100>;
 		};
 		};
-		button@3 {
+		button {
 			label = "USB VBUS error";
 			label = "USB VBUS error";
 			linux,code = <KEY_UNKNOWN>;
 			linux,code = <KEY_UNKNOWN>;
 			gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
 			gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;

+ 1 - 1
arch/arm/boot/dts/armada-xp-axpwifiap.dts

@@ -113,7 +113,7 @@
 		pinctrl-0 = <&keys_pin>;
 		pinctrl-0 = <&keys_pin>;
 		pinctrl-names = "default";
 		pinctrl-names = "default";
 
 
-		button@1 {
+		reset {
 			label = "Factory Reset Button";
 			label = "Factory Reset Button";
 			linux,code = <KEY_SETUP>;
 			linux,code = <KEY_SETUP>;
 			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

+ 2 - 2
arch/arm/boot/dts/armada-xp-linksys-mamba.dts

@@ -267,13 +267,13 @@
 		pinctrl-0 = <&keys_pin>;
 		pinctrl-0 = <&keys_pin>;
 		pinctrl-names = "default";
 		pinctrl-names = "default";
 
 
-		button@1 {
+		wps {
 			label = "WPS";
 			label = "WPS";
 			linux,code = <KEY_WPS_BUTTON>;
 			linux,code = <KEY_WPS_BUTTON>;
 			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 		};
 		};
 
 
-		button@2 {
+		reset {
 			label = "Factory Reset Button";
 			label = "Factory Reset Button";
 			linux,code = <KEY_RESTART>;
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

+ 1 - 1
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

@@ -139,7 +139,7 @@
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <0>;
 				#size-cells = <0>;
 
 
-				button@1 {
+				init {
 					label = "Init Button";
 					label = "Init Button";
 					linux,code = <KEY_POWER>;
 					linux,code = <KEY_POWER>;
 					gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
 					gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;