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

Commit 395c755f authored Apr 03, 2016 by Andrew Lunn Committed by Gregory CLEMENT Apr 14, 2016

ARM: dts: kirkwood: Remove button address and fixup names

The DT compiler is now warning about unit names with addresses but not
reg property. Fix all the gpio-key buttons which causes warnings.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

parent 9ec423ed

arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,13 +36,13 @@
		gpio_keys {
		compatible = "gpio-keys";

		button@1{
		reset {
		label = "Reset";
		linux,code = <KEY_POWER>;
		gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
		};

		button@2{
		button {
		label = "Power";
		linux,code = <KEY_SLEEP>;
		gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/kirkwood-cloudbox.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@
		#address-cells = <1>;
		#size-cells = <0>;

		button@1 {
		power {
		label = "Power push button";
		linux,code = <KEY_POWER>;
		gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/kirkwood-dnskw.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -13,17 +13,17 @@
		&pmx_button_reset>;
		pinctrl-names = "default";

		button@1 {
		power {
		label = "Power button";
		linux,code = <KEY_POWER>;
		gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
		};
		button@2 {
		eject {
		label = "USB unmount button";
		linux,code = <KEY_EJECTCD>;
		gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
		};
		button@3 {
		reset {
		label = "Reset button";
		linux,code = <KEY_RESTART>;
		gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/kirkwood-ib62x0.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -62,12 +62,12 @@
		pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>;
		pinctrl-names = "default";

		button@1 {
		copy {
		label = "USB Copy";
		linux,code = <KEY_COPY>;
		gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
		};
		button@2 {
		reset {
		label = "Reset";
		linux,code = <KEY_RESTART>;
		gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/kirkwood-iconnect.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -136,13 +136,13 @@
		pinctrl-0 = < &pmx_button_reset &pmx_button_otb >;
		pinctrl-names = "default";

		button@1 {
		otb {
		label = "OTB Button";
		linux,code = <KEY_COPY>;
		gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
		debounce-interval = <100>;
		};
		button@2 {
		reset {
		label = "Reset";
		linux,code = <KEY_RESTART>;
		gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;