From owner-svn-src-head@FreeBSD.ORG  Sat Apr 21 04:17:30 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA13F1065674;
	Sat, 21 Apr 2012 04:17:30 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C55838FC12;
	Sat, 21 Apr 2012 04:17:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3L4HUAh070832;
	Sat, 21 Apr 2012 04:17:30 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3L4HUPR070830;
	Sat, 21 Apr 2012 04:17:30 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201204210417.q3L4HUPR070830@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 21 Apr 2012 04:17:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234525 - head/sys/mips/mips
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 21 Apr 2012 04:17:31 -0000

Author: adrian
Date: Sat Apr 21 04:17:30 2012
New Revision: 234525
URL: http://svn.freebsd.org/changeset/base/234525

Log:
  Allow for MIPS devices to have a specific probe/attach order.
  
  The default priority is now '1000' rather than '0'.  This may cause some
  unforseen regressions.
  
  Submitted by:	Stefan Bethke <stb@lassitu.de>
  Reviewed by:	imp

Modified:
  head/sys/mips/mips/nexus.c

Modified: head/sys/mips/mips/nexus.c
==============================================================================
--- head/sys/mips/mips/nexus.c	Sat Apr 21 01:51:16 2012	(r234524)
+++ head/sys/mips/mips/nexus.c	Sat Apr 21 04:17:30 2012	(r234525)
@@ -237,11 +237,14 @@ nexus_hinted_child(device_t bus, const c
 	device_t child;
 	long	maddr;
 	int	msize;
+	int	order;
 	int	result;
 	int	irq;
 	int	mem_hints_count;
 
-	child = BUS_ADD_CHILD(bus, 0, dname, dunit);
+	if ((resource_int_value(dname, dunit, "order", &order)) != 0)
+		order = 1000;
+	child = BUS_ADD_CHILD(bus, order, dname, dunit);
 	if (child == NULL)
 		return;