ath79: replace generic button node names

In several DTS files, button nodes are just named buttonX or
xxx_button. This replaces the names with more specific names matching
the majority of key definitions.

While at it, fix name of keys node in one case.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2019-11-07 17:03:50 +01:00
parent edbadec843
commit 4176100b06
18 changed files with 30 additions and 30 deletions

View File

@ -32,7 +32,7 @@
debounce-interval = <60>; debounce-interval = <60>;
}; };
button_usb { usb {
label = "usb"; label = "usb";
linux,code = <BTN_2>; linux,code = <BTN_2>;
gpios = <&gpio 7 GPIO_ACTIVE_LOW>; gpios = <&gpio 7 GPIO_ACTIVE_LOW>;

View File

@ -27,14 +27,14 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
button0 { reset {
label = "reset"; label = "reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 3 GPIO_ACTIVE_LOW>; gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
debounce-interval = <60>; debounce-interval = <60>;
}; };
button1 { qss {
label = "qss"; label = "qss";
linux,code = <KEY_WPS_BUTTON>; linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 7 GPIO_ACTIVE_LOW>; gpios = <&gpio 7 GPIO_ACTIVE_LOW>;

View File

@ -21,14 +21,14 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
button0 { reset {
label = "reset"; label = "reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 3 GPIO_ACTIVE_LOW>; gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
debounce-interval = <60>; debounce-interval = <60>;
}; };
button1 { qss {
label = "qss"; label = "qss";
linux,code = <KEY_WPS_BUTTON>; linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 7 GPIO_ACTIVE_LOW>; gpios = <&gpio 7 GPIO_ACTIVE_LOW>;

View File

@ -49,14 +49,14 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
button0 { reset {
label = "reset"; label = "reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
debounce-interval = <60>; debounce-interval = <60>;
}; };
button1 { sw1 {
label = "sw1"; label = "sw1";
linux,input-type = <EV_SW>; linux,input-type = <EV_SW>;
linux,code = <BTN_0>; linux,code = <BTN_0>;
@ -64,7 +64,7 @@
debounce-interval = <60>; debounce-interval = <60>;
}; };
button2 { sw2 {
label = "sw2"; label = "sw2";
linux,input-type = <EV_SW>; linux,input-type = <EV_SW>;
linux,code = <BTN_1>; linux,code = <BTN_1>;

View File

@ -17,7 +17,7 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
button0 { reset {
label = "reset"; label = "reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 17 GPIO_ACTIVE_LOW>; gpios = <&gpio 17 GPIO_ACTIVE_LOW>;

View File

@ -20,19 +20,19 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&jtag_disable_pins>; pinctrl-0 = <&jtag_disable_pins>;
button0 { reset {
label = "reset"; label = "reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 3 GPIO_ACTIVE_LOW>; gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
}; };
button1 { right {
label = "button right"; label = "button right";
linux,code = <BTN_0>; linux,code = <BTN_0>;
gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
}; };
button3 { left {
label = "button left"; label = "button left";
linux,code = <BTN_1>; linux,code = <BTN_1>;
gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;

View File

@ -16,7 +16,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&jtag_disable_pins>; pinctrl-0 = <&jtag_disable_pins>;
button0 { reset {
label = "reset"; label = "reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 3 GPIO_ACTIVE_LOW>; gpios = <&gpio 3 GPIO_ACTIVE_LOW>;

View File

@ -46,7 +46,7 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
reset_button { reset {
label = "Reset button"; label = "Reset button";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 17 GPIO_ACTIVE_LOW>; gpios = <&gpio 17 GPIO_ACTIVE_LOW>;

View File

@ -14,7 +14,7 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
button0 { reset {
label = "reset"; label = "reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 19 GPIO_ACTIVE_LOW>; gpios = <&gpio 19 GPIO_ACTIVE_LOW>;

View File

@ -42,7 +42,7 @@
}; };
}; };
button { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
reset { reset {

View File

@ -44,7 +44,7 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
button0 { reset {
label = "reset"; label = "reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>; gpios = <&gpio 1 GPIO_ACTIVE_LOW>;

View File

@ -76,7 +76,7 @@
debounce-interval = <60>; debounce-interval = <60>;
}; };
wifi_button { wifi {
label = "WiFi button"; label = "WiFi button";
linux,code = <KEY_RFKILL>; linux,code = <KEY_RFKILL>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>; gpios = <&gpio 1 GPIO_ACTIVE_LOW>;

View File

@ -86,13 +86,13 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
wps_button { wps {
label = "WPS button"; label = "WPS button";
linux,code = <KEY_WPS_BUTTON>; linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 2 GPIO_ACTIVE_LOW>; gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
}; };
wlan_button { wlan {
label = "WLAN button"; label = "WLAN button";
linux,code = <KEY_RFKILL>; linux,code = <KEY_RFKILL>;
gpios = <&gpio 21 GPIO_ACTIVE_LOW>; gpios = <&gpio 21 GPIO_ACTIVE_LOW>;

View File

@ -45,13 +45,13 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
wifi_button { wifi {
label = "WiFi button"; label = "WiFi button";
linux,code = <KEY_RFKILL>; linux,code = <KEY_RFKILL>;
gpios = <&gpio 22 GPIO_ACTIVE_LOW>; gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
}; };
reset_button { reset {
label = "Reset button"; label = "Reset button";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>; gpios = <&gpio 1 GPIO_ACTIVE_LOW>;

View File

@ -85,19 +85,19 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
wps_button { wps {
label = "WPS button"; label = "WPS button";
linux,code = <KEY_WPS_BUTTON>; linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>; gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
}; };
wifi_button { wifi {
label = "WiFi button"; label = "WiFi button";
linux,code = <KEY_RFKILL>; linux,code = <KEY_RFKILL>;
gpios = <&gpio 2 GPIO_ACTIVE_LOW>; gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
}; };
reset_button { reset {
label = "Reset button"; label = "Reset button";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 21 GPIO_ACTIVE_LOW>; gpios = <&gpio 21 GPIO_ACTIVE_LOW>;

View File

@ -22,13 +22,13 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
wifi_button { wifi {
label = "WiFi button"; label = "WiFi button";
linux,code = <KEY_RFKILL>; linux,code = <KEY_RFKILL>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>; gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
}; };
reset_button { reset {
label = "Reset button"; label = "Reset button";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 21 GPIO_ACTIVE_LOW>; gpios = <&gpio 21 GPIO_ACTIVE_LOW>;

View File

@ -37,7 +37,7 @@
debounce-interval = <60>; debounce-interval = <60>;
}; };
button_wps { wps {
label = "wps"; label = "wps";
gpios = <&gpio 5 GPIO_ACTIVE_LOW>; gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>; linux,code = <KEY_WPS_BUTTON>;

View File

@ -18,13 +18,13 @@
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
wifi_button { wifi {
label = "WiFi button"; label = "WiFi button";
linux,code = <KEY_RFKILL>; linux,code = <KEY_RFKILL>;
gpios = <&gpio 2 GPIO_ACTIVE_LOW>; gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
}; };
reset_button { reset {
label = "Reset button"; label = "Reset button";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>; gpios = <&gpio 1 GPIO_ACTIVE_LOW>;