From owner-svn-src-head@FreeBSD.ORG  Fri Nov 21 20:54:13 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 597A52CE;
 Fri, 21 Nov 2014 20:54:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C9C4A94;
 Fri, 21 Nov 2014 20:54:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALKsDcX031305;
 Fri, 21 Nov 2014 20:54:13 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALKsCd4031300;
 Fri, 21 Nov 2014 20:54:12 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201411212054.sALKsCd4031300@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brooks set sender to
 brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Nov 2014 20:54:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274818 - head/sys/boot/fdt/dts/mips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Nov 2014 20:54:13 -0000

Author: brooks
Date: Fri Nov 21 20:54:12 2014
New Revision: 274818
URL: https://svnweb.freebsd.org/changeset/base/274818

Log:
  Merge from CheriBSD (3422ebe71b6c06fe78b1be73623b240c219e08e3):
  
  Rename beripic to beripic0.
  
  MFC after:	1 week
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/boot/fdt/dts/mips/beri-sim.dts
  head/sys/boot/fdt/dts/mips/beripad-de4.dts

Modified: head/sys/boot/fdt/dts/mips/beri-sim.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beri-sim.dts	Fri Nov 21 20:53:17 2014	(r274817)
+++ head/sys/boot/fdt/dts/mips/beri-sim.dts	Fri Nov 21 20:54:12 2014	(r274818)
@@ -97,7 +97,7 @@
 			reg = <0x0 0x4000000>;		// 64M at 0x0
 		};
 
-		beripic: beripic@7f804000 {
+		beripic0: beripic@7f804000 {
 			compatible = "sri-cambridge,beri-pic";
 			interrupt-controller;
 			#address-cells = <0>;
@@ -115,7 +115,7 @@
 			compatible = "altera,jtag_uart-11_0";
 			reg = <0x7f000000 0x40>;
 			interrupts = <0>;
-			interrupt-parent = <&beripic>;
+			interrupt-parent = <&beripic0>;
 		};
 
 		serial@7f001000 {

Modified: head/sys/boot/fdt/dts/mips/beripad-de4.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beripad-de4.dts	Fri Nov 21 20:53:17 2014	(r274817)
+++ head/sys/boot/fdt/dts/mips/beripad-de4.dts	Fri Nov 21 20:54:12 2014	(r274818)
@@ -97,7 +97,7 @@
 			reg = <0x0 0x40000000>;		// 1G at 0x0
 		};
 
-		beripic: beripic@7f804000 {
+		beripic0: beripic@7f804000 {
 			compatible = "sri-cambridge,beri-pic";
 			interrupt-controller;
 			#address-cells = <0>;
@@ -117,14 +117,14 @@
 			reg-shift = <2>;
 			clock-frequency = <50000000>;
 			interrupts = <6>;
-			interrupt-parent = <&beripic>;
+			interrupt-parent = <&beripic0>;
 		};
 
 		serial@7f000000 {
 			compatible = "altera,jtag_uart-11_0";
 			reg = <0x7f000000 0x40>;
 			interrupts = <0>;
-			interrupt-parent = <&beripic>;
+			interrupt-parent = <&beripic0>;
 		};
 
 		serial@7f001000 {
@@ -198,7 +198,7 @@
 			       0x7f007420 0x20>;
 			// RX, TX
 			interrupts = <1 2>;
-			interrupt-parent = <&beripic>;
+			interrupt-parent = <&beripic0>;
 		};
 
 		ethernet@7f005000 {
@@ -211,7 +211,7 @@
 			       0x7f005420 0x20>;
 			// RX, TX
 			interrupts = <11 12>;
-			interrupt-parent = <&beripic>;
+			interrupt-parent = <&beripic0>;
 		};
 
 		touchscreen@70400000 {
@@ -227,7 +227,7 @@
 			       0x7f140000 0x4>;
 			// IRQ 4 is DC, IRQ 5 is HC.
 			interrupts = <4 5>;
-			interrupt-parent = <&beripic>;
+			interrupt-parent = <&beripic0>;
 		};
 
 		avgen@0x7f009000 {