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>

diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
index e3971d1e956ae145508e9e1afe67062065573e66..71769ef9f734eb85029fd5d8675ca02b5652b708 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
@@ -32,7 +32,7 @@
                        debounce-interval = <60>;
                };
 
-               button_usb {
+               usb {
                        label = "usb";
                        linux,code = <BTN_2>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
index 3728b682c820b0a6b025d4ff85f119c9ff960dac..846e517de8a23a61270dda35e95265ad28aadcd4 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
@@ -27,14 +27,14 @@
        keys {
                compatible = "gpio-keys";
 
-               button0 {
+               reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };
 
-               button1 {
+               qss {
                        label = "qss";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
index 80677fa894643ff2e1ab1299973b7d9a04bdadb1..1be4d6183ac2901d3cec1e7f200a9f0f4012e267 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
@@ -21,14 +21,14 @@
        keys {
                compatible = "gpio-keys";
 
-               button0 {
+               reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };
 
-               button1 {
+               qss {
                        label = "qss";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
index 9b222904e14fd376d4f36f5d0fbb8e150104295f..3cd5c130c88f404c41dfdfb4e40d1d3dc1e8e5b2 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
@@ -49,14 +49,14 @@
        keys {
                compatible = "gpio-keys";
 
-               button0 {
+               reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                        debounce-interval = <60>;
                };
 
-               button1 {
+               sw1 {
                        label = "sw1";
                        linux,input-type = <EV_SW>;
                        linux,code = <BTN_0>;
@@ -64,7 +64,7 @@
                        debounce-interval = <60>;
                };
 
-               button2 {
+               sw2 {
                        label = "sw2";
                        linux,input-type = <EV_SW>;
                        linux,code = <BTN_1>;

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
index fb329232130ca778c40e803b8bfba0abdee45bf5..74a3554bcb57ef4fb478d0a3fa0597f7f13dead6 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
@@ -17,7 +17,7 @@
        keys {
                compatible = "gpio-keys";
 
-               button0 {
+               reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index 67a3331ab39826997b5a5a3c67f58e837d2446e3..78961bf71b5450f969073900bfceafeea1d9c05d 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -20,19 +20,19 @@
                pinctrl-names = "default";
                pinctrl-0 = <&jtag_disable_pins>;
 
-               button0 {
+               reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
-               button1 {
+               right {
                        label = "button right";
                        linux,code = <BTN_0>;
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                };
 
-               button3 {
+               left {
                        label = "button left";
                        linux,code = <BTN_1>;
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index ae4553a2075ec0552d3eb318a96e076a58ae6963..c845b5465acdae0187912ea6bec4490babef17a8 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -16,7 +16,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&jtag_disable_pins>;
 
-               button0 {
+               reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
index 8f0a86334e143474cd79d73e361152f5fb2ccbc4..50d34c7c9059c7df296debec07333e542e5c1aa1 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
@@ -46,7 +46,7 @@
        keys {
                compatible = "gpio-keys";
 
-               reset_button {
+               reset {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
index 5f7498a06e6ab20b8e413fc57efcad5084e77f12..39fae74b83ee5262f54c36b8ec74dee2aa275fff 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
@@ -14,7 +14,7 @@
        keys {
                compatible = "gpio-keys";
 
-               button0 {
+               reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index 8d3d5c58a6b51e659a2702cf81b15d7566246c78..5c01126bc447663afb4138788327e9077b0d3a7d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -42,7 +42,7 @@
                };
        };
 
-       button {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
index 7d7433d44e1a58bbe5c9913697d7793e2ae1751f..83e76e463eb813c025d2f69b6ed051d5c9c29292 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
@@ -44,7 +44,7 @@
        keys {
                compatible = "gpio-keys";
 
-               button0 {
+               reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index d81d9c54f59caf9cc9a2a6578c5c02921eba8709..5a896d52bcc248f39e3f965e26384f658b02b997 100644 (file)
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -76,7 +76,7 @@
                        debounce-interval = <60>;
                };
 
-               wifi_button {
+               wifi {
                        label = "WiFi button";
                        linux,code = <KEY_RFKILL>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
index 2bb135eaff8daedc1a135edbea99194ea00bfdcd..64122525907020dddc154fb924824deb78335aa7 100644 (file)
--- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
+++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
@@ -86,13 +86,13 @@
        keys {
                compatible = "gpio-keys";
 
-               wps_button {
+               wps {
                        label = "WPS button";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
-               wlan_button {
+               wlan {
                        label = "WLAN button";
                        linux,code = <KEY_RFKILL>;
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
index 351e37519d13235cd4a8eda0664e8fc9b41a63bb..f894fc867296049add271a50e22d3a3050c0e2b3 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -45,13 +45,13 @@
        keys {
                compatible = "gpio-keys";
 
-               wifi_button {
+               wifi {
                        label = "WiFi button";
                        linux,code = <KEY_RFKILL>;
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
-               reset_button {
+               reset {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
index 26cc9ec2e8b5d0b56ac42feae895fbb5e2a5e40b..00cd413bd2793886cedc22f755394d47252103b0 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
@@ -85,19 +85,19 @@
        keys {
                compatible = "gpio-keys";
 
-               wps_button {
+               wps {
                        label = "WPS button";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
-               wifi_button {
+               wifi {
                        label = "WiFi button";
                        linux,code = <KEY_RFKILL>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
-               reset_button {
+               reset {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
index 21a470961f65a47b303414d446d2830d37fd1d07..719a9d065a268c9bc702968423e590921cf7b29e 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
@@ -22,13 +22,13 @@
        keys {
                compatible = "gpio-keys";
 
-               wifi_button {
+               wifi {
                        label = "WiFi button";
                        linux,code = <KEY_RFKILL>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
-               reset_button {
+               reset {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
index 028c1747d28e200dd64575c1eb629f0c7e4dee6c..f04304ee4c891972b690823d77222b5ec96b14b6 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
@@ -37,7 +37,7 @@
                        debounce-interval = <60>;
                };
 
-               button_wps {
+               wps {
                        label = "wps";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi
index 21c16be36d30eb4b3081a0904cf5fb6b50e2800a..c6bb8a2417b04fe659b2216eaa997744b15a2d31 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi
@@ -18,13 +18,13 @@
        keys {
                compatible = "gpio-keys";
 
-               wifi_button {
+               wifi {
                        label = "WiFi button";
                        linux,code = <KEY_RFKILL>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
-               reset_button {
+               reset {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;