Date: Sun, 25 Nov 2012 12:11:09 +0000 (UTC) From: Aleksandr Rybalko <ray@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243507 - projects/efika_mx/sys/powerpc/mpc85xx Message-ID: <201211251211.qAPCB9pe056054@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ray Date: Sun Nov 25 12:11:09 2012 New Revision: 243507 URL: http://svnweb.freebsd.org/changeset/base/243507 Log: Allow to bind to i.MX i2c controllers. Sponsored by: FreeBSD Foundation Modified: projects/efika_mx/sys/powerpc/mpc85xx/i2c.c Modified: projects/efika_mx/sys/powerpc/mpc85xx/i2c.c ============================================================================== --- projects/efika_mx/sys/powerpc/mpc85xx/i2c.c Sun Nov 25 11:26:36 2012 (r243506) +++ projects/efika_mx/sys/powerpc/mpc85xx/i2c.c Sun Nov 25 12:11:09 2012 (r243507) @@ -83,6 +83,8 @@ struct i2c_softc { device_t iicbus; struct resource *res; struct mtx mutex; + int flags; +#define FSL_IMX_I2C (1 << 0) /* To distinguish MPC and i.MX SoCs */ int rid; bus_space_handle_t bsh; bus_space_tag_t bst; @@ -187,10 +189,16 @@ i2c_probe(device_t dev) { struct i2c_softc *sc; - if (!ofw_bus_is_compatible(dev, "fsl-i2c")) + sc = device_get_softc(dev); + + if (ofw_bus_is_compatible(dev, "fsl-i2c")) + /* compatible */; + else if (ofw_bus_is_compatible(dev, "fsl,imx-i2c")) + /* compatible, i.MX SoC */ + sc->flags |= FSL_IMX_I2C; + else return (ENXIO); - sc = device_get_softc(dev); sc->rid = 0; sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid, @@ -341,7 +349,8 @@ i2c_reset(device_t dev, u_char speed, u_ i2c_write_reg(sc, I2C_STATUS_REG, 0x0); DELAY(1000); i2c_write_reg(sc, I2C_FDR_REG, baud_rate); - i2c_write_reg(sc, I2C_DFSRR_REG, I2C_DFSSR_DIV); + if (!(sc->flags & FSL_IMX_I2C)) + i2c_write_reg(sc, I2C_DFSRR_REG, I2C_DFSSR_DIV); i2c_write_reg(sc, I2C_CONTROL_REG, I2C_ENABLE); DELAY(1000); mtx_unlock(&sc->mutex);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211251211.qAPCB9pe056054>