X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7621_mikrotik_routerboard-m33g.dts;h=223d03b9fd12dddb0d9c708e87a15e89ce7feb94;hb=HEAD;hp=19e1a71e993c5aeeee6cb74331948af64b505695;hpb=f761f4052c411bababed2d2e9d8dc3f43380e4ee;p=openwrt%2Fstaging%2Fdedeckeh.git

diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
index 19e1a71e99..223d03b9fd 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
@@ -1,9 +1,4 @@
-/dts-v1/;
-
-#include "mt7621.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
+#include "mt7621_mikrotik.dtsi"
 
 / {
 	compatible = "mikrotik,routerboard-m33g", "mediatek,mt7621-soc";
@@ -16,29 +11,15 @@
 		led-upgrade = &led_usr;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,115200";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
 		led_usr: usr {
-			label = "routerboard-m33g:green:usr";
+			label = "green:usr";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
-	keys {
-		compatible = "gpio-keys";
-
-		res {
-			label = "res";
-			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-
 	pcie0_vcc_reg {
 		compatible = "regulator-fixed";
 		regulator-name = "pcie0_vcc";
@@ -88,63 +69,10 @@
 };
 
 &spi0 {
-	status = "okay";
-
-	w25q40@0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <3125000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "RouterBoot";
-				reg = <0x0 0x40000>;
-				read-only;
-				compatible = "fixed-partitions";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partition@0 {
-					label = "bootloader1";
-					reg = <0x0 0xf000>;
-					read-only;
-				};
-
-				hard_config: partition@f000 {
-					label = "hard_config";
-					reg = <0xf000 0x1000>;
-					read-only;
-				};
-
-				partition@10000 {
-					label = "bootloader2";
-					reg = <0x10000 0xf000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "soft_config";
-					reg = <0x20000 0x1000>;
-				};
-
-				partition@30000 {
-					label = "bios";
-					reg = <0x30000 0x1000>;
-					read-only;
-				};
-			};
-		};
-	};
-
-	w25q128@1 {
+	flash@1 {
 		compatible = "jedec,spi-nor";
 		reg = <1>;
-		// XXX empiric value to obtain actual 10MHz SCK at the chip
-		spi-max-frequency = <3125000>;
+		spi-max-frequency = <33000000>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -156,26 +84,26 @@
 			partition@40000 {
 				compatible = "mikrotik,minor";
 				label = "firmware";
-				reg = <0x040000 0xFC0000>;
+				reg = <0x040000 0xfc0000>;
 			};
 		};
 	};
 };
 
-&gmac0 {
-	mtd-mac-address = <&hard_config 0x0010>;
-	mtd-mac-address-increment = <1>;
+&gmac1 {
+	status = "okay";
+	label = "wan";
+	phy-handle = <&ethphy0>;
+};
+
+&mdio {
+	ethphy0: ethernet-phy@0 {
+		reg = <0>;
+	};
 };
 
 &switch0 {
 	ports {
-		port@0 {
-			status = "okay";
-			label = "wan";
-			mtd-mac-address = <&hard_config 0x0010>;
-			mtd-mac-address-increment = <2>;
-		};
-
 		port@1 {
 			status = "okay";
 			label = "lan1";
@@ -206,3 +134,7 @@
 &pcie {
 	status = "okay";
 };
+
+&uartlite3 {
+	status = "okay";
+};