X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fdts%2Fvr-3025u.dts;h=126ca94fa78821aaf7dd53c77f59ee6d99233e6a;hb=7880a6f7fee89efe9e5e4c707b59ba45f02e21cf;hp=b24b590dc35afe0ea3f4befcebed170ac9d66879;hpb=4981c7da0d8e4a7c882f0665f8857cfd56e7b797;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts
index b24b590dc3..126ca94fa7 100644
--- a/target/linux/brcm63xx/dts/vr-3025u.dts
+++ b/target/linux/brcm63xx/dts/vr-3025u.dts
@@ -8,6 +8,11 @@
 	model = "Comtrend VR-3025u";
 	compatible = "comtrend,vr-3025u", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+		stdout-path = "serial0:115200n8";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -17,7 +22,7 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio1 2 1>;
+			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
 		};
 	};
@@ -27,40 +32,24 @@
 
 		dsl_green {
 			label = "VR-3025u:green:dsl";
-			gpios = <&gpio0 2 1>;
+			gpios = <&pinctrl 2 1>;
 		};
 		inet_green {
 			label = "VR-3025u:green:inet";
-			gpios = <&gpio0 5 0>;
-		};
-		lan1_green {
-			label = "VR-3025u:green:lan1";
-			gpios = <&gpio0 6 1>;
-		};
-		lan2_green {
-			label = "VR-3025u:green:lan2";
-			gpios = <&gpio0 7 1>;
-		};
-		lan3_green {
-			label = "VR-3025u:green:lan3";
-			gpios = <&gpio0 8 1>;
-		};
-		lan4_green {
-			label = "VR-3025u:green:lan4";
-			gpios = <&gpio0 9 1>;
+			gpios = <&pinctrl 5 0>;
 		};
 		power_green {
 			label = "VR-3025u:green:power";
-			gpios = <&gpio0 22 0>;
+			gpios = <&pinctrl 22 0>;
 			default-state = "on";
 		};
 		power_red {
 			label = "VR-3025u:red:power";
-			gpios = <&gpio0 24 0>;
+			gpios = <&pinctrl 24 0>;
 		};
 		inet_red {
 			label = "VR-3025u:red:inet";
-			gpios = <&gpio0 31 0>;
+			gpios = <&pinctrl 31 0>;
 		};
 	};
 };
@@ -68,21 +57,36 @@
 &pflash {
 	status = "ok";
 
-	linux,part-probe = "bcm63xxpart";
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	cfe@0 {
-		label = "CFE";
-		reg = <0x0000000 0x0020000>;
-		read-only;
-	};
+		cfe@0 {
+			label = "CFE";
+			reg = <0x0000000 0x0020000>;
+			read-only;
+		};
 
-	linux@20000 {
-		label = "linux";
-		reg = <0x0020000 0x1fc0000>;
-	};
+		linux@20000 {
+			label = "linux";
+			reg = <0x0020000 0x1fc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
 
-	nvram@1fe0000 {
-		label = "nvram";
-		reg = <0x1fe0000 0x020000>;
+		nvram@1fe0000 {
+			label = "nvram";
+			reg = <0x1fe0000 0x020000>;
+		};
 	};
 };
+
+&pinctrl {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led
+		     &pinctrl_ephy2_led &pinctrl_ephy3_led>;
+};
+
+&uart0 {
+	status = "ok";
+};