From owner-svn-src-all@FreeBSD.ORG  Sat Jan 29 21:08:03 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9D0F4106564A;
	Sat, 29 Jan 2011 21:08:03 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8DB358FC08;
	Sat, 29 Jan 2011 21:08:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0TL83vp045659;
	Sat, 29 Jan 2011 21:08:03 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0TL83vW045657;
	Sat, 29 Jan 2011 21:08:03 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201101292108.p0TL83vW045657@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 29 Jan 2011 21:08:03 +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: r218076 - head/sys/dev/fdt
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Jan 2011 21:08:03 -0000

Author: marcel
Date: Sat Jan 29 21:08:03 2011
New Revision: 218076
URL: http://svn.freebsd.org/changeset/base/218076

Log:
  Call newbus_device_create() for PCI devices. Call pci_from_fdt_node()
  for the newly created device_t, rather than the parent.

Modified:
  head/sys/dev/fdt/fdtbus.c

Modified: head/sys/dev/fdt/fdtbus.c
==============================================================================
--- head/sys/dev/fdt/fdtbus.c	Sat Jan 29 20:58:38 2011	(r218075)
+++ head/sys/dev/fdt/fdtbus.c	Sat Jan 29 21:08:03 2011	(r218076)
@@ -39,10 +39,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/malloc.h>
 
-#include <dev/ofw/openfirm.h>
-
 #include <machine/fdt.h>
 
+#include <dev/ofw/openfirm.h>
+
 #include "fdt_common.h"
 #include "ofw_bus_if.h"
 
@@ -150,6 +150,8 @@ static void
 fdtbus_identify(driver_t *driver, device_t parent)
 {
 
+	debugf("%s(driver=%p, parent=%p)\n", __func__, driver, parent);
+
 	if (device_find_child(parent, "fdtbus", -1) == NULL)
 		BUS_ADD_CHILD(parent, 0, "fdtbus", -1);
 }
@@ -158,6 +160,8 @@ static int
 fdtbus_probe(device_t dev)
 {
 
+	debugf("%s(dev=%p); pass=%u\n", __func__, dev, bus_current_pass);
+
 	device_set_desc(dev, "FDT main bus");
 	if (!bootverbose)
 		device_quiet(dev);
@@ -472,12 +476,9 @@ newbus_device_from_fdt_node(device_t dev
 			return;
 		}
 
-	if (type != NULL && strcmp(type, "pci") == 0) {
-		pci_from_fdt_node(dev_par, node, name, type, compat);
-		return;
-	}
-
 	child = newbus_device_create(dev_par, node, name, type, compat);
+	if (type != NULL && strcmp(type, "pci") == 0)
+		pci_from_fdt_node(child, node, name, type, compat);
 }
 
 static struct resource *