From owner-p4-projects@FreeBSD.ORG  Thu Jan 28 12:04:55 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 481CE1065694; Thu, 28 Jan 2010 12:04:55 +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 0CB4B106568B
	for <perforce@freebsd.org>; Thu, 28 Jan 2010 12:04:55 +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 ED31B8FC17
	for <perforce@freebsd.org>; Thu, 28 Jan 2010 12:04:54 +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 o0SC4sSv037100
	for <perforce@freebsd.org>; Thu, 28 Jan 2010 12:04:54 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SC4s2g037098
	for perforce@freebsd.org; Thu, 28 Jan 2010 12:04:54 GMT
	(envelope-from raj@freebsd.org)
Date: Thu, 28 Jan 2010 12:04:54 GMT
Message-Id: <201001281204.o0SC4s2g037098@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 173830 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: Thu, 28 Jan 2010 12:04:55 -0000

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

Change 173830 by raj@raj_fdt on 2010/01/28 12:04:41

	Convert Marvell TWSI (I2C) driver to FDT/simplebus convention.

Affected files ...

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

Differences ...

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

@@ -57,6 +57,9 @@
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
 #include "iicbus_if.h"
 
 #define MV_TWSI_NAME		"twsi"
@@ -151,7 +154,7 @@
 	sizeof(struct mv_twsi_softc),
 };
 
-DRIVER_MODULE(twsi, mbus, mv_twsi_driver, mv_twsi_devclass, 0, 0);
+DRIVER_MODULE(twsi, simplebus, mv_twsi_driver, mv_twsi_devclass, 0, 0);
 DRIVER_MODULE(iicbus, twsi, iicbus_driver, iicbus_devclass, 0, 0);
 MODULE_DEPEND(twsi, iicbus, 1, 1, 1);
 
@@ -289,6 +292,9 @@
 mv_twsi_probe(device_t dev)
 {
 
+	if (!ofw_bus_is_compatible(dev, "mrvl,twsi"))
+		return (ENXIO);
+
 	device_set_desc(dev, "Marvell Integrated I2C Bus Controller");
 	return (BUS_PROBE_DEFAULT);
 }