From owner-p4-projects@FreeBSD.ORG  Thu Jan  3 16:44:03 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E820C53C; Thu,  3 Jan 2013 16:44:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 9FDDD53A
 for <perforce@freebsd.org>; Thu,  3 Jan 2013 16:44:02 +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 774A52ED
 for <perforce@freebsd.org>; Thu,  3 Jan 2013 16:44:02 +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 r03Gi2FC059238
 for <perforce@freebsd.org>; Thu, 3 Jan 2013 16:44:02 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 r03Gi2QZ059235
 for perforce@freebsd.org; Thu, 3 Jan 2013 16:44:02 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 3 Jan 2013 16:44:02 GMT
Message-Id: <201301031644.r03Gi2QZ059235@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 219946 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: Thu, 03 Jan 2013 16:44:03 -0000

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

Change 219946 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/01/03 16:43:49

	Populate a template FDT description of the Terasic tPad as
	configured for BERI.  The touch screen DMA buffer and FIFO are
	in the middle of DRAM, so for now expose only 64M rather than
	128M to FreeBSD, until we've sorted out how to handle reserved
	memory regions with FDT.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-tpad.dts#2 edit

Differences ...

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

@@ -64,9 +64,32 @@
 		compatible = "simple-bus", "mips4k,cp0";
 		ranges = <>;
 
+		/*
+		 * XXXRW: Should mark the video display frame buffer as
+		 * reserved!  Until then, mark 64M as available DRAM rather
+		 * than 128M.
+		 */
 		memory {
 			device_type = "memory";
-			reg = <0x0 0x40000000>;		// 1G at 0x0
+			reg = <0x0 0x4000000>;		// 64M at 0x0
+		};
+
+		display@4000000 {
+			compatible = "sri-cambridge,avgen";
+			reg = <0x4000000 0x1000000>;
+			sri-cambridge,width = <2>;
+			sri-cambridge,fileio = "rw";
+			sri-cambridge,mmapio = "rw";
+			sri-cambridge,devname = "display";
+		};
+
+		display@5000000 {
+			compatible = "sri-cambridge,avgen";
+			reg = <0x5000000 0x20>;
+			sri-cambridge,width = <4>;
+			sri-cambridge,fileio = "rw";
+			sri-cambridge,mmapio = "rw";
+			sri-cambridge,devname = "touch";
 		};
 
 		serial@7f000000 {
@@ -100,31 +123,6 @@
 			reg = <0x7f007000 0x540>;
 		};
 
-		touchscreen@70400000 {
-			compatible = "sri-cambridge,mtl";
-			reg = <0x70400000 0x1000
-			       0x70000000 0x177000
-			       0x70177000 0x2000>;
-		};
-
-		flash@0x74000000 {
-			compatible = "intel,strataflash";
-			reg = <0x74000000 0x2000000>;
-		};
-
-		flash@0x76000000 {
-			compatible = "intel,strataflash";
-			reg = <0x76000000 0x2000000>;
-		};
-
-		avgen@0x7f009000 {
-			compatible = "sri-cambridge,avgen";
-			reg = <0x7f009000 0x2>;	
-			sri-cambridge,width = <1>;
-			sri-cambridge,fileio = "r";
-			sri-cambridge,devname = "de4bsw";
-		};
-
 		avgen@0x7f00a000 {
 			compatible = "sri-cambridge,avgen";
 			reg = <0x7f00a000 0x14>;