Date: Tue, 15 Dec 2009 22:52:00 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 171822 for review Message-ID: <200912152252.nBFMq0Sh074247@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912152252.nBFMq0Sh074247>