redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Andrew Lunn 2016-04-03 04:03:43 +02:00 committed by Gregory CLEMENT
parent 9ec423ed62
commit 395c755fb8
18 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
View file

@ -36,13 +36,13 @@
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
button@1{ reset {
label = "Reset"; label = "Reset";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
}; };
button@2{ button {
label = "Power"; label = "Power";
linux,code = <KEY_SLEEP>; linux,code = <KEY_SLEEP>;
gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;

2
arch/arm/boot/dts/kirkwood-cloudbox.dts
View file

@ -60,7 +60,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
button@1 { power {
label = "Power push button"; label = "Power push button";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

6
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View file

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

4
arch/arm/boot/dts/kirkwood-ib62x0.dts
View file

@ -62,12 +62,12 @@
pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>; pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { copy {
label = "USB Copy"; label = "USB Copy";
linux,code = <KEY_COPY>; linux,code = <KEY_COPY>;
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
}; };
button@2 { reset {
label = "Reset"; label = "Reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;

4
arch/arm/boot/dts/kirkwood-iconnect.dts
View file

@ -136,13 +136,13 @@
pinctrl-0 = < &pmx_button_reset &pmx_button_otb >; pinctrl-0 = < &pmx_button_reset &pmx_button_otb >;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { otb {
label = "OTB Button"; label = "OTB Button";
linux,code = <KEY_COPY>; linux,code = <KEY_COPY>;
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
debounce-interval = <100>; debounce-interval = <100>;
}; };
button@2 { reset {
label = "Reset"; label = "Reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;

2
arch/arm/boot/dts/kirkwood-laplug.dts
View file

@ -62,7 +62,7 @@
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
button@1{ power {
label = "Power push button"; label = "Power push button";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;

6
arch/arm/boot/dts/kirkwood-lsxl.dtsi
View file

@ -107,18 +107,18 @@
&pmx_power_auto_switch>; &pmx_power_auto_switch>;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { option {
label = "Function Button"; label = "Function Button";
linux,code = <KEY_OPTION>; linux,code = <KEY_OPTION>;
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
}; };
button@2 { reserved {
label = "Power-on Switch"; label = "Power-on Switch";
linux,code = <KEY_RESERVED>; linux,code = <KEY_RESERVED>;
linux,input-type = <5>; linux,input-type = <5>;
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
}; };
button@3 { power {
label = "Power-auto Switch"; label = "Power-auto Switch";
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
linux,input-type = <5>; linux,input-type = <5>;

4
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View file

@ -109,12 +109,12 @@
pinctrl-0 = <&pmx_keys>; pinctrl-0 = <&pmx_keys>;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { restart {
label = "SWR Button"; label = "SWR Button";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
}; };
button@2 { wps {
label = "WPS Button"; label = "WPS Button";
linux,code = <KEY_WPS_BUTTON>; linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

8
arch/arm/boot/dts/kirkwood-netxbig.dtsi
View file

@ -59,22 +59,22 @@
#size-cells = <0>; #size-cells = <0>;
/* /*
* button@1 and button@2 represent a three position rocker * esc and power represent a three position rocker
* switch. Thus the conventional KEY_POWER does not fit * switch. Thus the conventional KEY_POWER does not fit
*/ */
button@1 { exc {
label = "Back power switch (on|auto)"; label = "Back power switch (on|auto)";
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
linux,input-type = <5>; linux,input-type = <5>;
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
}; };
button@2 { power {
label = "Back power switch (auto|off)"; label = "Back power switch (auto|off)";
linux,code = <KEY_1>; linux,code = <KEY_1>;
linux,input-type = <5>; linux,input-type = <5>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
}; };
button@3 { option {
label = "Function button"; label = "Function button";
linux,code = <KEY_OPTION>; linux,code = <KEY_OPTION>;
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;

2
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
View file

@ -57,7 +57,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
button@1 { power {
label = "Power push button"; label = "Power push button";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;

6
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
View file

@ -77,17 +77,17 @@
pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { power {
label = "Power Button"; label = "Power Button";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
}; };
button@2 { copy {
label = "Copy Button"; label = "Copy Button";
linux,code = <KEY_COPY>; linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
}; };
button@3 { reset {
label = "Reset Button"; label = "Reset Button";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;

2
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View file

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

2
arch/arm/boot/dts/kirkwood-openblocks_a7.dts
View file

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

2
arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
View file

@ -33,7 +33,7 @@
pinctrl-0 = <&pmx_button_eject>; pinctrl-0 = <&pmx_button_eject>;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { eject {
debounce_interval = <50>; debounce_interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_EJECTCD>; linux,code = <KEY_EJECTCD>;

2
arch/arm/boot/dts/kirkwood-t5325.dts
View file

@ -173,7 +173,7 @@
pinctrl-0 = <&pmx_button_power>; pinctrl-0 = <&pmx_button_power>;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { power {
label = "Power Button"; label = "Power Button";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;

4
arch/arm/boot/dts/kirkwood-ts219-6281.dts
View file

@ -39,12 +39,12 @@
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>; pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { copy {
label = "USB Copy"; label = "USB Copy";
linux,code = <KEY_COPY>; linux,code = <KEY_COPY>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
}; };
button@2 { reset {
label = "Reset"; label = "Reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

4
arch/arm/boot/dts/kirkwood-ts219-6282.dts
View file

@ -49,12 +49,12 @@
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>; pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { copy {
label = "USB Copy"; label = "USB Copy";
linux,code = <KEY_COPY>; linux,code = <KEY_COPY>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
}; };
button@2 { reset {
label = "Reset"; label = "Reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;

4
arch/arm/boot/dts/kirkwood-ts419.dtsi
View file

@ -45,12 +45,12 @@
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>; pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default"; pinctrl-names = "default";
button@1 { copy {
label = "USB Copy"; label = "USB Copy";
linux,code = <KEY_COPY>; linux,code = <KEY_COPY>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
}; };
button@2 { reset {
label = "Reset"; label = "Reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;