From 4176100b0690db3a53cb6fcfe70dbf9e7d59347e Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 7 Nov 2019 17:03:50 +0100 Subject: [PATCH] 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 --- target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts | 2 +- target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts | 4 ++-- target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts | 4 ++-- target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts | 6 +++--- target/linux/ath79/dts/qca9531_comfast_cf-e5.dts | 2 +- target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi | 6 +++--- target/linux/ath79/dts/qca9531_glinet_gl-x750.dts | 2 +- target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi | 2 +- target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi | 2 +- .../linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts | 2 +- target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts | 2 +- target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 2 +- target/linux/ath79/dts/qca9561_avm_fritz4020.dts | 4 ++-- target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts | 4 ++-- target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi | 6 +++--- target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi | 4 ++-- target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi | 2 +- target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi | 4 ++-- 18 files changed, 30 insertions(+), 30 deletions(-) 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 e3971d1e95..71769ef9f7 100644 --- 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 = ; 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 3728b682c8..846e517de8 100644 --- 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 = ; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; debounce-interval = <60>; }; - button1 { + qss { label = "qss"; linux,code = ; 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 80677fa894..1be4d6183a 100644 --- 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 = ; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; debounce-interval = <60>; }; - button1 { + qss { label = "qss"; linux,code = ; 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 9b222904e1..3cd5c130c8 100644 --- 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 = ; gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; debounce-interval = <60>; }; - button1 { + sw1 { label = "sw1"; linux,input-type = ; linux,code = ; @@ -64,7 +64,7 @@ debounce-interval = <60>; }; - button2 { + sw2 { label = "sw2"; linux,input-type = ; linux,code = ; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts index fb32923213..74a3554bcb 100644 --- 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 = ; 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 67a3331ab3..78961bf71b 100644 --- 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 = ; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; - button1 { + right { label = "button right"; linux,code = ; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; - button3 { + left { label = "button left"; linux,code = ; 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 ae4553a207..c845b5465a 100644 --- 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 = ; 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 8f0a86334e..50d34c7c90 100644 --- 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 = ; 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 5f7498a06e..39fae74b83 100644 --- 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 = ; 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 8d3d5c58a6..5c01126bc4 100644 --- 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 7d7433d44e..83e76e463e 100644 --- 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 = ; 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 d81d9c54f5..5a896d52bc 100644 --- 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 = ; 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 2bb135eaff..6412252590 100644 --- 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 = ; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; - wlan_button { + wlan { label = "WLAN button"; linux,code = ; 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 351e37519d..f894fc8672 100644 --- 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 = ; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; - reset_button { + reset { label = "Reset button"; linux,code = ; 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 26cc9ec2e8..00cd413bd2 100644 --- 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 = ; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; - wifi_button { + wifi { label = "WiFi button"; linux,code = ; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; - reset_button { + reset { label = "Reset button"; linux,code = ; 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 21a470961f..719a9d065a 100644 --- 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 = ; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; - reset_button { + reset { label = "Reset button"; linux,code = ; 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 028c1747d2..f04304ee4c 100644 --- 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 = ; diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi index 21c16be36d..c6bb8a2417 100644 --- 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 = ; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; - reset_button { + reset { label = "Reset button"; linux,code = ; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; -- 2.25.1