Commit 395c755f authored by Andrew Lunn's avatar Andrew Lunn Committed by Gregory CLEMENT

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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 9ec423ed
......@@ -36,13 +36,13 @@ gpio_poweroff {
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>;
......
......@@ -60,7 +60,7 @@ gpio_keys {
#address-cells = <1>;
#size-cells = <0>;
button@1 {
power {
label = "Power push button";
linux,code = <KEY_POWER>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
......
......@@ -13,17 +13,17 @@ gpio_keys {
&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>;
......
......@@ -62,12 +62,12 @@ gpio_keys {
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>;
......
......@@ -136,13 +136,13 @@ gpio_keys {
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>;
......
......@@ -62,7 +62,7 @@ pmx_usb_power_enable: pmx-usb-power-enable {
gpio_keys {
compatible = "gpio-keys";
button@1{
power {
label = "Power push button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
......
......@@ -107,18 +107,18 @@ gpio_keys {
&pmx_power_auto_switch>;
pinctrl-names = "default";
button@1 {
option {
label = "Function Button";
linux,code = <KEY_OPTION>;
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
button@2 {
reserved {
label = "Power-on Switch";
linux,code = <KEY_RESERVED>;
linux,input-type = <5>;
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
};
button@3 {
power {
label = "Power-auto Switch";
linux,code = <KEY_ESC>;
linux,input-type = <5>;
......
......@@ -109,12 +109,12 @@ gpio_keys {
pinctrl-0 = <&pmx_keys>;
pinctrl-names = "default";
button@1 {
restart {
label = "SWR Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
button@2 {
wps {
label = "WPS Button";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
......
......@@ -59,22 +59,22 @@ gpio-keys {
#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
*/
button@1 {
exc {
label = "Back power switch (on|auto)";
linux,code = <KEY_ESC>;
linux,input-type = <5>;
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
};
button@2 {
power {
label = "Back power switch (auto|off)";
linux,code = <KEY_1>;
linux,input-type = <5>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
};
button@3 {
option {
label = "Function button";
linux,code = <KEY_OPTION>;
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
......
......@@ -57,7 +57,7 @@ gpio_keys {
#address-cells = <1>;
#size-cells = <0>;
button@1 {
power {
label = "Power push button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
......
......@@ -77,17 +77,17 @@ gpio_keys {
pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
pinctrl-names = "default";
button@1 {
power {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
copy {
label = "Copy Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
reset {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
......
......@@ -117,7 +117,7 @@ gpio_keys {
#address-cells = <1>;
#size-cells = <0>;
button@1 {
power {
label = "Init Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
......
......@@ -135,7 +135,7 @@ gpio_keys {
#address-cells = <1>;
#size-cells = <0>;
button@1 {
button {
label = "Init Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
......
......@@ -33,7 +33,7 @@ gpio_keys {
pinctrl-0 = <&pmx_button_eject>;
pinctrl-names = "default";
button@1 {
eject {
debounce_interval = <50>;
wakeup-source;
linux,code = <KEY_EJECTCD>;
......
......@@ -173,7 +173,7 @@ gpio_keys {
pinctrl-0 = <&pmx_button_power>;
pinctrl-names = "default";
button@1 {
power {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
......
......@@ -39,12 +39,12 @@ gpio_keys {
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default";
button@1 {
copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
};
button@2 {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
......
......@@ -49,12 +49,12 @@ gpio_keys {
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default";
button@1 {
copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
button@2 {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
......
......@@ -45,12 +45,12 @@ gpio_keys {
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default";
button@1 {
copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
button@2 {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment