From fccc3217fb05d843733c08de3176bc21a7d36e11 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sat, 7 Sep 2019 16:52:45 +0800
Subject: [PATCH] ramips: improve support for Xiaomi Miwifi Nano

---
 .../linux/ramips/base-files/etc/init.d/bootcount | 16 ++++++++--------
 target/linux/ramips/dts/MIWIFI-NANO.dts          | 13 ++++++++++---
 target/linux/ramips/image/mt76x8.mk              |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/target/linux/ramips/base-files/etc/init.d/bootcount b/target/linux/ramips/base-files/etc/init.d/bootcount
index 0f260fa3fc..e086e055e6 100755
--- a/target/linux/ramips/base-files/etc/init.d/bootcount
+++ b/target/linux/ramips/base-files/etc/init.d/bootcount
@@ -1,12 +1,12 @@
 #!/bin/sh /etc/rc.common
-
 START=99
-
-start() {
-	. /lib/functions.sh
-
-	local board=$(board_name)
-	if [ $board = "sk-wb8" ]; then
+boot() {
+	case $(board_name) in
+	samknows,whitebox-v8)
 		fw_setenv bootcount 0
-	fi
+		;;
+	xiaomi,miwifi-nano)
+		fw_setenv flag_boot_success 1
+		;;
+	esac
 }
diff --git a/target/linux/ramips/dts/MIWIFI-NANO.dts b/target/linux/ramips/dts/MIWIFI-NANO.dts
index 6aa300a7a8..4740942ca8 100644
--- a/target/linux/ramips/dts/MIWIFI-NANO.dts
+++ b/target/linux/ramips/dts/MIWIFI-NANO.dts
@@ -57,12 +57,20 @@
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
-			ralink,group = "refclk", "wled_an", "gpio";
+			ralink,group = "gpio", "refclk", "wdt", "wled_an";
 			ralink,function = "gpio";
 		};
 	};
 };
 
+&ehci {
+	status = "disabled";
+};
+
+&ohci {
+	status = "disabled";
+};
+
 &wmac {
 	status = "okay";
 	ralink,mtd-eeprom = <&factory 0x4>;
@@ -78,7 +86,7 @@
 	m25p80@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		spi-max-frequency = <10000000>;
+		spi-max-frequency = <40000000>;
 		m25p,chunked-io = <32>;
 
 		partitions {
@@ -89,7 +97,6 @@
 			partition@0 {
 				label = "u-boot";
 				reg = <0x0 0x30000>;
-				read-only;
 			};
 
 			partition@30000 {
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index 3a2d8e3a5e..7cfe1606b0 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -97,7 +97,7 @@ define Device/miwifi-nano
   DTS := MIWIFI-NANO
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Xiaomi MiWiFi Nano
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := uboot-envtools
 endef
 TARGET_DEVICES += miwifi-nano