From 18a87273c0eae2847a6ca09f493d7fa9bb42add9 Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Thu, 26 Sep 2019 20:35:50 -0700
Subject: [PATCH] ramips: fix XiaoYu XY-C5 dts

---
 target/linux/ramips/dts/XiaoYu-C5.dts | 57 +++++++++++----------------
 target/linux/ramips/image/mt7621.mk   |  3 +-
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/target/linux/ramips/dts/XiaoYu-C5.dts b/target/linux/ramips/dts/XiaoYu-C5.dts
index 5152714b8..001ebc9dd 100644
--- a/target/linux/ramips/dts/XiaoYu-C5.dts
+++ b/target/linux/ramips/dts/XiaoYu-C5.dts
@@ -6,44 +6,37 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "XiaoYu-C5", "mediatek,mt7621-soc";
-	model = "XiaoYu-C5";
+	compatible = "xiaoyu,xy-c5", "mediatek,mt7621-soc";
+	model = "XiaoYu XY-C5";
 
 	aliases {
-		led-boot = &led_system;
-		led-failsafe = &led_system;
-		led-running = &led_system;
-		led-upgrade = &led_system;
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x1c000000>, <0x20000000 0x4000000>;
+		led-boot = &led_sys;
+		led-failsafe = &led_sys;
+		led-running = &led_sys;
+		led-upgrade = &led_sys;
+		label-mac-device = &ethernet;
 	};
 
 	chosen {
-		bootargs = "console=ttyS0,115200";
+		bootargs = "console=ttyS0,57600";
 	};
 
-	gpio-leds {
+	leds {
 		compatible = "gpio-leds";
 
-		led_system:system {
-			label = "XiaoYu-C5:green:system";
-			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+		work {
+			label = "xy-c5:green:work";
+			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 
-		work {
-			label = "XiaoYu-C5:green:usb3.0";
-			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
-			linux,default-trigger = "usbport";
+		led_sys: sys {
+			label = "xy-c5:green:sys";
+			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 	};
 
-	gpio-keys-polled {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
+	keys {
+		compatible = "gpio-keys";
 
 		reset {
 			label = "reset";
@@ -51,17 +44,15 @@
 			linux,code = <KEY_RESTART>;
 		};
 	};
-
 };
 
 &spi0 {
 	status = "okay";
 
-	m25p80@0 {
+	flash@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		spi-max-frequency = <10000000>;
-		m25p,chunked-io = <32>;
+		spi-max-frequency = <25000000>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -89,11 +80,7 @@
 			partition@50000 {
 				compatible = "denx,uimage";
 				label = "firmware";
-				reg = <0x50000 0x1fa0000>;
-			};
-			partition@1ff0000 {
-				label = "mib0";
-				reg = <0x1ff0000 0x10000>;
+				reg = <0x50000 0x1fb0000>;
 			};
 		};
 	};
@@ -110,8 +97,8 @@
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
-			ralink,group = "i2c", "jtag" , "uart2", "uart3";
+			ralink,group = "uart3", "wdt";
 			ralink,function = "gpio";
 		};
 	};
-};
+};
\ No newline at end of file
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index cc6639066..ce08c98b0 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -584,8 +584,7 @@ define Device/XiaoYu-C5
   DTS := XiaoYu-C5
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_TITLE := XiaoYu-C5
-  DEVICE_PACKAGES := \
-	kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3
 endef
 TARGET_DEVICES += XiaoYu-C5