From owner-svn-src-projects@FreeBSD.ORG  Tue Mar 19 21:45:30 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D63D0D86;
 Tue, 19 Mar 2013 21:45:30 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C8DFA8EB;
 Tue, 19 Mar 2013 21:45:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2JLjUvS054954;
 Tue, 19 Mar 2013 21:45:30 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2JLjU0t054953;
 Tue, 19 Mar 2013 21:45:30 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201303192145.r2JLjU0t054953@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Tue, 19 Mar 2013 21:45:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248536 - projects/efika_mx/sys/powerpc/mpc85xx
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Mar 2013 21:45:30 -0000

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);