X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fdts%2Far1004g.dts;h=c7f8c506879d6327713486ee482170bbb9e02cc0;hb=7880a6f7fee89efe9e5e4c707b59ba45f02e21cf;hp=479c934ed529061b155718bc8f94588fa2312eef;hpb=97b36aca09da7a1b214f4616a8549e99ff2d92aa;p=oweals%2Fopenwrt.git

diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/ar1004g.dts
index 479c934ed5..c7f8c50687 100644
--- a/target/linux/brcm63xx/dts/ar1004g.dts
+++ b/target/linux/brcm63xx/dts/ar1004g.dts
@@ -9,7 +9,8 @@
 	compatible = "asmax,ar1004g", "brcm,bcm6348";
 
 	chosen {
-		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+		stdout-path = "serial0:115200n8";
 	};
 
 	gpio-keys-polled {
@@ -21,7 +22,7 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio1 1 1>;
+			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
 		};
 	};
@@ -31,16 +32,16 @@
 
 		power_green {
 			label = "AR1004G:green:power";
-			gpios = <&gpio0 0 1>;
+			gpios = <&pinctrl 0 1>;
 			default-state = "on";
 		};
 		inet_green {
 			label = "AR1004G:green:inet";
-			gpios = <&gpio0 3 1>;
+			gpios = <&pinctrl 3 1>;
 		};
 		power_red {
 			label = "AR1004G:red:power";
-			gpios = <&gpio0 6 1>;
+			gpios = <&pinctrl 6 1>;
 		};
 	};
 };
@@ -48,21 +49,35 @@
 &pflash {
 	status = "ok";
 
-	linux,part-probe = "bcm63xxpart";
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	cfe@0 {
-		label = "CFE";
-		reg = <0x000000 0x010000>;
-		read-only;
-	};
+		cfe@0 {
+			label = "CFE";
+			reg = <0x000000 0x010000>;
+			read-only;
+		};
 
-	linux@10000 {
-		label = "linux";
-		reg = <0x010000 0x3e0000>;
-	};
+		linux@10000 {
+			label = "linux";
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
 
-	nvram@3f0000 {
-		label = "nvram";
-		reg = <0x3f0000 0x010000>;
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
+
+&pinctrl {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_ext_mii &pinctrl_pci>;
+};
+
+&uart0 {
+	status = "ok";
+};