From owner-svn-src-projects@FreeBSD.ORG  Sun Nov 25 12:11:10 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 48E106EE;
 Sun, 25 Nov 2012 12:11:10 +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 15F3E8FC15;
 Sun, 25 Nov 2012 12:11:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAPCB9wK056055;
 Sun, 25 Nov 2012 12:11:09 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAPCB9pe056054;
 Sun, 25 Nov 2012 12:11:09 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201211251211.qAPCB9pe056054@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Sun, 25 Nov 2012 12:11:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r243507 - 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: Sun, 25 Nov 2012 12:11:10 -0000

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