Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e622af0 authored Nov 06, 2016 by Gregory CLEMENT

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>

parent eb94ec64

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>;

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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>;

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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>;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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>;