From owner-p4-projects@FreeBSD.ORG  Wed Jan  2 09:34:30 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 1A0D718F; Wed,  2 Jan 2013 09:34:30 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
 by hub.freebsd.org (Postfix) with ESMTP id CEA3718D
 for <perforce@freebsd.org>; Wed,  2 Jan 2013 09:34:29 +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 B00A18FC08
 for <perforce@freebsd.org>; Wed,  2 Jan 2013 09:34:29 +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 r029YTen074348
 for <perforce@freebsd.org>; Wed, 2 Jan 2013 09:34:29 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 r029YTfM074345
 for perforce@freebsd.org; Wed, 2 Jan 2013 09:34:29 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 2 Jan 2013 09:34:29 GMT
Message-Id: <201301020934.r029YTfM074345@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 219934 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: Wed, 02 Jan 2013 09:34:30 -0000

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

Change 219934 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/01/02 09:33:48

	Enable mips4k,cp0 interrupt configuration for the BERI FDT DTS
	file, as well as interrupts on the first JTAG UART.  Move atse
	configuration from device.hints to FDT.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#8 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#6 edit

Differences ...

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

@@ -55,7 +55,13 @@
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "simple-bus";
+		#interrupt-cells = <1>;
+
+		/*
+		 * Declare mips4k,cp0 since BERI doesn't (yet) have a PIC, so
+		 * we use mips4k coprocessor 0 interrupt management directly.
+		 */
+		compatible = "simple-bus", "mips4k,cp0";
 		ranges = <>;
 
 		memory {
@@ -66,7 +72,7 @@
 		serial@7f000000 {
 			compatible = "altera,jtag_uart-11_0";
 			reg = <0x7f000000 0x40>;
-			// interrupts = <0>;
+			interrupts = <0>;
 		};
 
 		serial@7f001000 {
@@ -89,12 +95,12 @@
 			reg = <0x7f006000 0x1>;
 		};
 
-/*
 		ethernet@7f007000 {
 			compatible = "altera,atse";
 			reg = <0x7f007000 0x540>;
 		};
 
+/*
 		touchscreen@70400000 {
 			compatible = "cambridge,mtl";
 			reg = <0x70400000 0x1000

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#6 (text+ko) ====

@@ -35,9 +35,9 @@
 #
 # Altera Triple-Speed Ethernet Mac, present in tPad and DE-4 configurations
 #
-hint.atse.0.at="nexus0"
-hint.atse.0.maddr=0x7f007000
-hint.atse.0.msize=0x540
+#hint.atse.0.at="nexus0"
+#hint.atse.0.maddr=0x7f007000
+#hint.atse.0.msize=0x540
 
 #
 # Terasic Multi-touch LCD (MTL), an optional feature in DE-4 configurations.