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 <[email protected]>

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>;

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>;

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>;

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>;

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>;

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>;

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>;

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>;

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>;

target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts

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

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>;

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>;

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>;

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>;

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>;

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>;

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>;

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>;