From owner-p4-projects@FreeBSD.ORG  Tue Dec 15 22:52:01 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E088A1065695; Tue, 15 Dec 2009 22:52:00 +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 A4D541065670
	for <perforce@freebsd.org>; Tue, 15 Dec 2009 22:52:00 +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 81B828FC1A
	for <perforce@freebsd.org>; Tue, 15 Dec 2009 22:52:00 +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 nBFMq0EP074249
	for <perforce@freebsd.org>; Tue, 15 Dec 2009 22:52:00 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBFMq0Sh074247
	for perforce@freebsd.org; Tue, 15 Dec 2009 22:52:00 GMT
	(envelope-from raj@freebsd.org)
Date: Tue, 15 Dec 2009 22:52:00 GMT
Message-Id: <200912152252.nBFMq0Sh074247@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 171822 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: Tue, 15 Dec 2009 22:52:01 -0000

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

Change 171822 by raj@raj_fdt on 2009/12/15 22:51:23

	Convert Freescale I2C driver to FDT/simplebus convention.
	
	This is the first real driver to work with FDT!

Affected files ...

.. //depot/projects/fdt/sys/powerpc/mpc85xx/i2c.c#2 edit

Differences ...

==== //depot/projects/fdt/sys/powerpc/mpc85xx/i2c.c#2 (text+ko) ====

@@ -46,7 +46,8 @@
 #include <dev/iicbus/iicbus.h>
 #include "iicbus_if.h"
 
-#include <powerpc/mpc85xx/ocpbus.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
 
 #define I2C_ADDR_REG		0x00 /* I2C slave address register */
 #define I2C_FDR_REG		0x04 /* I2C frequency divider register */
@@ -124,7 +125,7 @@
 };
 static devclass_t  i2c_devclass;
 
-DRIVER_MODULE(i2c, ocpbus, i2c_driver, i2c_devclass, 0, 0);
+DRIVER_MODULE(i2c, simplebus, i2c_driver, i2c_devclass, 0, 0);
 DRIVER_MODULE(iicbus, i2c, iicbus_driver, iicbus_devclass, 0, 0);
 
 static __inline void
@@ -157,7 +158,7 @@
 	int err;
 	uint8_t status;
 
-	status = i2c_read_reg(sc,I2C_STATUS_REG);
+	status = i2c_read_reg(sc, I2C_STATUS_REG);
 	if (status & I2CSR_MIF) {
 		if (write && start && (status & I2CSR_RXAK)) {
 			debugf("no ack %s", start ?
@@ -188,19 +189,9 @@
 static int
 i2c_probe(device_t dev)
 {
-	device_t parent;
 	struct i2c_softc *sc;
-	uintptr_t devtype;
-	int error;
 
-	parent = device_get_parent(dev);
-
-	error = BUS_READ_IVAR(parent, dev, OCPBUS_IVAR_DEVTYPE, &devtype);
-
-	if (error)
-		return (error);
-
-	if (devtype != OCPBUS_DEVTYPE_I2C)
+	if (!ofw_bus_is_compatible(dev, "fsl-i2c"))
 		return (ENXIO);
 
 	sc = device_get_softc(dev);
@@ -209,7 +200,7 @@
 	sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid,
 	    RF_ACTIVE);
 	if (sc->res == NULL) {
-		device_printf(dev, "could not allocate resources");
+		device_printf(dev, "could not allocate resources\n");
 		return (ENXIO);
 	}