From: Mathias Kresin <dev@kresin.me>
Date: Thu, 21 Dec 2017 18:55:25 +0000 (+0100)
Subject: ramips: fix Linkit smart 7688 support
X-Git-Tag: v18.06.0-rc1~1484
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=c7776d4c552e1d2b10d111191376190c112a67e5;p=openwrt%2Fopenwrt.git

ramips: fix Linkit smart 7688 support

Use a more appropriate compatible string. Fix the wireless led GPIO and
add the default wireless trigger. Use the wireless LED for boot state
indication as well.

Remove the GPIO pinmux for pins not exposed on the board.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index a1c0c0e690..03d084f17b 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -245,6 +245,9 @@ kng_rc)
 	set_usb_led "$boardname:green:usb"
 	set_wifi_led "$boardname:green:wifi"
 	;;
+linkits7688)
+	ucidef_set_led_wlan "wifi" "wifi" "linkit-smart-7688:orange:wifi" "phy0tpt"
+	;;
 m2m)
 	set_wifi_led "$boardname:blue:wifi"
 	ucidef_set_led_netdev "eth" "Ethernet" "$boardname:green:wan" "eth0"
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index 6ad22f56c8..8858876899 100644
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -175,7 +175,7 @@ get_status_led() {
 		status_led="$boardname:blue:status"
 		;;
 	linkits7688)
-		[ "$1" = "upgrade" ] && status_led="mediatek:orange:wifi"
+		status_led="linkit-smart-7688:orange:wifi"
 		;;
 	m2m)
 		status_led="$boardname:blue:wifi"
diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts
index f21ffcca66..a81a2d5a4c 100644
--- a/target/linux/ramips/dts/LINKIT7688.dts
+++ b/target/linux/ramips/dts/LINKIT7688.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,linkit", "mediatek,mt7628an-soc";
+	compatible = "mediatek,linkit-smart-7688", "mediatek,mt7628an-soc";
 	model = "MediaTek LinkIt Smart 7688";
 
 	chosen {
@@ -32,9 +32,8 @@
 		compatible = "gpio-leds";
 
 		wifi {
-			label = "mediatek:orange:wifi";
-			gpios = <&wgpio 0 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
+			label = "linkit-smart-7688:orange:wifi";
+			gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -50,14 +49,6 @@
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
-
-	wgpio: gpio-wifi {
-		compatible = "mediatek,gpio-wifi";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		gpio-controller;
-		#gpio-cells = <2>;
-	};
 };
 
 &pinctrl {
@@ -67,11 +58,6 @@
 			ralink,function = "gpio";
 		};
 
-		perst {
-			ralink,group = "perst";
-			ralink,function = "gpio";
-		};
-
 		refclk {
 			ralink,group = "refclk";
 			ralink,function = "gpio";
@@ -87,14 +73,9 @@
 			ralink,function = "gpio";
 		};
 
-		wled_kn {
-			ralink,group = "wled_kn";
-			ralink,function = "gpio";
-		};
-
 		wled_an {
 			ralink,group = "wled_an";
-			ralink,function = "wled_an";
+			ralink,function = "gpio";
 		};
 
 		wdt {