Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 19 Mar 2013 21:45:30 +0000 (UTC)
From:      Aleksandr Rybalko <ray@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r248536 - projects/efika_mx/sys/powerpc/mpc85xx
Message-ID:  <201303192145.r2JLjU0t054953@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ray
Date: Tue Mar 19 21:45:30 2013
New Revision: 248536
URL: http://svnweb.freebsd.org/changeset/base/248536

Log:
  Revert r243507. Freescale i.MX515 I2C controller have different problems.

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	Tue Mar 19 21:40:14 2013	(r248535)
+++ projects/efika_mx/sys/powerpc/mpc85xx/i2c.c	Tue Mar 19 21:45:30 2013	(r248536)
@@ -83,8 +83,6 @@ 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;
@@ -189,16 +187,10 @@ i2c_probe(device_t dev)
 {
 	struct i2c_softc *sc;
 
-	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
+	if (!ofw_bus_is_compatible(dev, "fsl-i2c"))
 		return (ENXIO);
 
+	sc = device_get_softc(dev);
 	sc->rid = 0;
 
 	sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid,
@@ -349,8 +341,7 @@ 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);
-	if (!(sc->flags & FSL_IMX_I2C))
-		i2c_write_reg(sc, I2C_DFSRR_REG, I2C_DFSSR_DIV);
+	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?201303192145.r2JLjU0t054953>