diff mbox series

[OpenWrt-Devel,RFC,2/3] ath79: further fixes for ZyXEL NBG6716

Message ID 20200408132229.3873-3-freifunk@adrianschmutzler.de
State Superseded
Delegated to: Adrian Schmutzler
Headers show
Series ath79: further fixes for Zyxel NBG6716 support | expand

Commit Message

Adrian Schmutzler April 8, 2020, 1:22 p.m. UTC
This applies further fixes to the DTS of ZyXEL NBG6716 based on
what is found in ar71xx (mach-nbg6716.c):

- use WiFi label names as in ar71xx
- fix WPS gpio number
- fix GPIO_ACTIVE_HIGH and mode for WiFi switch
- add codes for USB eject buttons

Despite, add the WAN led to 01_leds.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts  | 15 +++++++++------
 .../ath79/nand/base-files/etc/board.d/01_leds     |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index a495bb187b..33650dc7dd 100644
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -48,21 +48,21 @@ 
 			trigger-sources = <&hub_port1>;
 		};
 
-		wifi2 {
-			label = "nbg6716:white:wifi2";
+		wifi2g {
+			label = "nbg6716:white:wifi2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
-		wifi5 {
-			label = "nbg6716:white:wifi5";
+		wifi5g {
+			label = "nbg6716:white:wifi5g";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wps {
 			label = "nbg6716:white:wps";
-			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -79,18 +79,21 @@ 
 		wifi {
 			label = "WiFi button";
 			linux,code = <KEY_RFKILL>;
-			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+			linux,input-type = <EV_SW>;
+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 			debounce-interval = <60>;
 		};
 
 		usb1 {
 			label = "USB1 eject button";
+			linux,code = <BTN_1>;
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
 		};
 
 		usb2 {
 			label = "USB2 eject button";
+			linux,code = <BTN_2>;
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
 		};
diff --git a/target/linux/ath79/nand/base-files/etc/board.d/01_leds b/target/linux/ath79/nand/base-files/etc/board.d/01_leds
index d9989ec538..73fd7089f5 100755
--- a/target/linux/ath79/nand/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/nand/base-files/etc/board.d/01_leds
@@ -18,6 +18,9 @@  netgear,wndr4300-v2|\
 netgear,wndr4500-v3)
 	ucidef_set_led_switch "wan-amber" "WAN (amber)" "netgear:amber:wan" "switch0" "0x20"
 	;;
+zyxel,nbg6716)
+	ucidef_set_led_netdev "wan" "WAN" "$boardname:white:internet" "eth1"
+	;;
 esac
 
 board_config_flush