From owner-p4-projects@FreeBSD.ORG  Wed Feb  3 20:39:05 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A4C7106575B; Wed,  3 Feb 2010 20:39:04 +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 32F4B106566B
	for <perforce@freebsd.org>; Wed,  3 Feb 2010 20:39:04 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 227148FC21
	for <perforce@freebsd.org>; Wed,  3 Feb 2010 20:39:04 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o13Kd4hv007891
	for <perforce@freebsd.org>; Wed, 3 Feb 2010 20:39:04 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o13Kd4Kr007889
	for perforce@freebsd.org; Wed, 3 Feb 2010 20:39:04 GMT
	(envelope-from raj@freebsd.org)
Date: Wed, 3 Feb 2010 20:39:04 GMT
Message-Id: <201002032039.o13Kd4Kr007889@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 174266 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 03 Feb 2010 20:39:05 -0000

http://p4web.freebsd.org/chv.cgi?CH=174266

Change 174266 by raj@raj_fdt on 2010/02/03 20:39:00

	Convert Marvell PIC to FDT/simplebus convention.

Affected files ...

.. //depot/projects/fdt/sys/arm/mv/ic.c#2 edit

Differences ...

==== //depot/projects/fdt/sys/arm/mv/ic.c#2 (text+ko) ====

@@ -40,6 +40,9 @@
 #include <machine/bus.h>
 #include <machine/intr.h>
 
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>
 
@@ -76,6 +79,9 @@
 mv_ic_probe(device_t dev)
 {
 
+	if (!ofw_bus_is_compatible(dev, "mrvl,pic"))
+		return (ENXIO);
+
 	device_set_desc(dev, "Marvell Integrated Interrupt Controller");
 	return (0);
 }
@@ -134,7 +140,7 @@
 
 static devclass_t mv_ic_devclass;
 
-DRIVER_MODULE(ic, mbus, mv_ic_driver, mv_ic_devclass, 0, 0);
+DRIVER_MODULE(ic, simplebus, mv_ic_driver, mv_ic_devclass, 0, 0);
 
 int
 arm_get_next_irq(int last __unused)