From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Wed, 8 Apr 2020 12:43:04 +0000 (+0200)
Subject: ath79: further fixes for ZyXEL NBG6716
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d0cb6e995b6d6fc3aef52e46749449c46f3e8aa7;p=openwrt%2Fstaging%2Fjow.git

ath79: further fixes for ZyXEL NBG6716

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
- fix node name for "internet" LED

This device has separate LEDs for WAN and "Internet". As the WAN-LED
(and the four LAN-LEDs) are driven independent of the setup in
DT/01_leds, the "internet" LED is left unassigned (in contrast to
ar71xx, where it was set up effectively as a second WAN LED)

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index 7fff1a78d9..2f00d0ba4d 100644
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -29,7 +29,7 @@
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
-		wan {
+		internet {
 			label = "nbg6716:white:internet";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
@@ -48,21 +48,21 @@
 			trigger-sources = <&hub_port0>;
 		};
 
-		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>;
 		};