From owner-p4-projects@FreeBSD.ORG  Sun Dec 30 18:01:05 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 60615413; Sun, 30 Dec 2012 18:01:05 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 21167411
 for <perforce@freebsd.org>; Sun, 30 Dec 2012 18:01:05 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id E04F18FC0C
 for <perforce@freebsd.org>; Sun, 30 Dec 2012 18:01:04 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBUI14Ff000811
 for <perforce@freebsd.org>; Sun, 30 Dec 2012 18:01:04 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBUI14JR000808
 for perforce@freebsd.org; Sun, 30 Dec 2012 18:01:04 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 30 Dec 2012 18:01:04 GMT
Message-Id: <201212301801.qBUI14JR000808@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 219919 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Dec 2012 18:01:05 -0000

http://p4web.freebsd.org/@@219919?ac=10

Change 219919 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2012/12/30 18:00:19

	Hang Avalon-attached devices off of a simplebus instance for BERI.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#3 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#3 (text+ko) ====

@@ -52,56 +52,62 @@
 		};
 	};
 
-	memory {
-		device_type = "memory";
-		reg = <0x0 0x40000000>;		// 1G at 0x0
-	};
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+
+		memory {
+			device_type = "memory";
+			reg = <0x0 0x40000000>;		// 1G at 0x0
+		};
 
-	serial@7f000000 {
-		compatible = "altera,jtag_uart-11_0";
-		reg = <0x7f000000 0x40>;
-		interrupts = <0>;
-	};
+		serial@7f000000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f000000 0x40>;
+			// interrupts = <0>;
+		};
 
-	serial@7f001000 {
-		compatible = "altera,jtag_uart-11_0";
-		reg = <0x7f001000 0x40>;
-	};
+		serial@7f001000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f001000 0x40>;
+		};
 
-	serial@7f002000 {
-		compatible = "altera,jtag_uart-11_0";
-		reg = <0x7f002000 0x40>;
-	};
+		serial@7f002000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f002000 0x40>;
+		};
 
-	sdcard@7f008000 {
-		compatible = "altera,sdcard_11_2011";
-		reg = <0x7f008000 0x400>;
-	};
+		sdcard@7f008000 {
+			compatible = "altera,sdcard_11_2011";
+			reg = <0x7f008000 0x400>;
+		};
 
-	led@7f006000 {
-		compatible = "cambridge,de4led";
-		reg = <0x7f006000 0x1>;
-	};
+		led@7f006000 {
+			compatible = "cambridge,de4led";
+			reg = <0x7f006000 0x1>;
+		};
 
-	ethernet@7f007000 {
-		compatible = "altera,atse";
-		reg = <0x7f007000 0x540>;
-	};
+		ethernet@7f007000 {
+			compatible = "altera,atse";
+			reg = <0x7f007000 0x540>;
+		};
 
-	touchscreen@70400000 {
-		compatible = "cambridge,mtl";
-		reg = <0x70400000 0x1000
-		       0x70000000 0x177000
-		       0x70177000 0x2000>;
-	};
+		touchscreen@70400000 {
+			compatible = "cambridge,mtl";
+			reg = <0x70400000 0x1000
+			       0x70000000 0x177000
+			       0x70177000 0x2000>;
+		};
 
-	flash@0x74000000 {
-		compatible = "intel,strataflash";
-		reg = <0x74000000 0x2000000>;
-	};
+		flash@0x74000000 {
+			compatible = "intel,strataflash";
+			reg = <0x74000000 0x2000000>;
+		};
 
-	flash@0x76000000 {
-		compatible = "intel,strataflash";
-		reg = <0x76000000 0x2000000>;
+		flash@0x76000000 {
+			compatible = "intel,strataflash";
+			reg = <0x76000000 0x2000000>;
+		};
 	};
 };