From owner-p4-projects@FreeBSD.ORG  Wed Feb  3 20:40: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 9379E106568B; Wed,  3 Feb 2010 20:40:05 +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 598B91065672
	for <perforce@freebsd.org>; Wed,  3 Feb 2010 20:40:05 +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 48D3E8FC1B
	for <perforce@freebsd.org>; Wed,  3 Feb 2010 20:40:05 +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 o13Ke5xe007988
	for <perforce@freebsd.org>; Wed, 3 Feb 2010 20:40:05 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o13Ke5IR007986
	for perforce@freebsd.org; Wed, 3 Feb 2010 20:40:05 GMT
	(envelope-from raj@freebsd.org)
Date: Wed, 3 Feb 2010 20:40:05 GMT
Message-Id: <201002032040.o13Ke5IR007986@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 174267 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:40:05 -0000

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

Change 174267 by raj@raj_fdt on 2010/02/03 20:39:57

	Convert Marvell CPU timer driver to FDT/simplebus convention.

Affected files ...

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

Differences ...

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

@@ -48,6 +48,9 @@
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>
 
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
 #define MV_TIMER_TICK	(get_tclk() / hz)
 #define INITIAL_TIMECOUNTER	(0xffffffff)
 #define MAX_WATCHDOG_TICKS	(0xffffffff)
@@ -97,6 +100,9 @@
 mv_timer_probe(device_t dev)
 {
 
+	if (!ofw_bus_is_compatible(dev, "mrvl,timer"))
+		return (ENXIO);
+
 	device_set_desc(dev, "Marvell CPU Timer");
 	return (0);
 }
@@ -171,7 +177,7 @@
 
 static devclass_t mv_timer_devclass;
 
-DRIVER_MODULE(timer, mbus, mv_timer_driver, mv_timer_devclass, 0, 0);
+DRIVER_MODULE(timer, simplebus, mv_timer_driver, mv_timer_devclass, 0, 0);
 
 static unsigned
 mv_timer_get_timecount(struct timecounter *tc)