From a170c3156d11068a8debe6037f7e7288b24bd08b Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sat, 7 Mar 2020 23:08:06 +0800
Subject: [PATCH] ramips: sync official commit for D-Link DIR-810L and Netgear
 R6800

---
 .../linux/ramips/dts/mt7620a_dlink_dir-810l.dts   |  6 +++---
 target/linux/ramips/dts/mt7621_netgear_r6800.dts  | 15 +++++++++++----
 target/linux/ramips/image/mt7621.mk               |  2 +-
 target/linux/ramips/mt7621/config-4.14            |  1 +
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
index da8d2238a1..d48c85c179 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
@@ -59,7 +59,7 @@
 	m25p80@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		spi-max-frequency = <10000000>;
+		spi-max-frequency = <50000000>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -102,9 +102,9 @@
 				read-only;
 			};
 
-			partition@e0000 {
+			partition@f0000 {
 				label = "Jffs2";
-				reg = <0xe0000 0x80000>;
+				reg = <0xf0000 0x80000>;
 				read-only;
 			};
 
diff --git a/target/linux/ramips/dts/mt7621_netgear_r6800.dts b/target/linux/ramips/dts/mt7621_netgear_r6800.dts
index 0993afe4c5..fed7bbba38 100644
--- a/target/linux/ramips/dts/mt7621_netgear_r6800.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_r6800.dts
@@ -41,27 +41,27 @@
 		wlan2g {
 			gpios = <&gpio_expander 4 GPIO_ACTIVE_LOW>;
 			label = "r6800:white:wlan2g";
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy0radio";
 		};
 
 		wlan5g {
 			gpios = <&gpio_expander 5 GPIO_ACTIVE_LOW>;
 			label = "r6800:white:wlan5g";
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy1radio";
 		};
 
 		usb2 {
 			gpios = <&gpio_expander 6 GPIO_ACTIVE_LOW>;
 			label = "r6800:white:usb2";
 			linux,default-trigger = "usbport";
-			trigger-sources = <&hub_port2>;
+			trigger-sources = <&ehci_port2>;
 		};
 
 		usb3 {
 			gpios = <&gpio_expander 7 GPIO_ACTIVE_LOW>;
 			label = "r6800:white:usb3";
 			linux,default-trigger = "usbport";
-			trigger-sources = <&hub_port1>;
+			trigger-sources = <&xhci_ehci_port1>;
 		};
 
 		lan1_orange {
@@ -115,3 +115,10 @@
 		};
 	};
 };
+
+&state_default {
+	gpio {
+		ralink,group = "uart3", "uart2", "jtag", "wdt";
+		ralink,function = "gpio";
+	};
+};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 3dfceb796b..063ea0fede 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -629,7 +629,7 @@ define Device/netgear_r6800
   SERCOMM_HWVER := A001
   SERCOMM_SWVER := 0x0062
   IMAGE_SIZE := 40960k
-  DEVICE_PACKAGES += kmod-mt7615e kmod-pinctrl-sx150x
+  DEVICE_PACKAGES += kmod-mt7615e
 endef
 TARGET_DEVICES += netgear_r6800
 
diff --git a/target/linux/ramips/mt7621/config-4.14 b/target/linux/ramips/mt7621/config-4.14
index 232a942d16..8560cfa0f0 100644
--- a/target/linux/ramips/mt7621/config-4.14
+++ b/target/linux/ramips/mt7621/config-4.14
@@ -237,6 +237,7 @@ CONFIG_PHYLIB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_RT2880=y
 # CONFIG_PINCTRL_SINGLE is not set
+CONFIG_PINCTRL_SX150X=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_SUPPLY=y