Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 27 Feb 2014 18:13:07 +0000 (UTC)
From:      Ruslan Bukin <br@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r262568 - head/sys/arm/freescale/vybrid
Message-ID:  <201402271813.s1RID7re097064@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: br
Date: Thu Feb 27 18:13:07 2014
New Revision: 262568
URL: http://svnweb.freebsd.org/changeset/base/262568

Log:
  Do not setup interrupt handler (polling is used).

Modified:
  head/sys/arm/freescale/vybrid/vf_i2c.c

Modified: head/sys/arm/freescale/vybrid/vf_i2c.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_i2c.c	Thu Feb 27 17:31:59 2014	(r262567)
+++ head/sys/arm/freescale/vybrid/vf_i2c.c	Thu Feb 27 18:13:07 2014	(r262568)
@@ -104,11 +104,9 @@ struct i2c_softc {
 	struct resource		*res[2];
 	bus_space_tag_t		bst;
 	bus_space_handle_t	bsh;
-	void			*ih;
 	device_t		dev;
 	device_t		iicbus;
 	struct mtx		mutex;
-	int			ibif;
 };
 
 static struct resource_spec i2c_spec[] = {
@@ -117,19 +115,6 @@ static struct resource_spec i2c_spec[] =
 	{ -1, 0 }
 };
 
-static void
-i2c_intr(void *arg)
-{
-	struct i2c_softc *sc;
-
-	sc = arg;
-
-	if (READ1(sc, I2C_IBSR) & IBSR_IBIF) {
-		WRITE1(sc, I2C_IBSR, IBSR_IBIF);
-		sc->ibif = 1;
-	}
-}
-
 static int
 i2c_probe(device_t dev)
 {
@@ -148,7 +133,6 @@ static int
 i2c_attach(device_t dev)
 {
 	struct i2c_softc *sc;
-	int err;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
@@ -164,14 +148,6 @@ i2c_attach(device_t dev)
 	sc->bst = rman_get_bustag(sc->res[0]);
 	sc->bsh = rman_get_bushandle(sc->res[0]);
 
-	/* Setup interrupt handler */
-	err = bus_setup_intr(dev, sc->res[1], INTR_TYPE_BIO | INTR_MPSAFE,
-	    NULL, i2c_intr, sc, &sc->ih);
-	if (err) {
-		device_printf(dev, "Unable to alloc interrupt resource.\n");
-		return (ENXIO);
-	}
-
 	WRITE1(sc, I2C_IBIC, IBIC_BIIE);
 
 	sc->iicbus = device_add_child(dev, "iicbus", -1);
@@ -194,8 +170,10 @@ wait_for_iif(struct i2c_softc *sc)
 
 	retry = 1000;
 	while (retry --) {
-		if (sc->ibif == 1)
+		if (READ1(sc, I2C_IBSR) & IBSR_IBIF) {
+			WRITE1(sc, I2C_IBSR, IBSR_IBIF);
 			return (IIC_NOERR);
+		}
 		DELAY(10);
 	}
 
@@ -227,8 +205,10 @@ wait_for_icf(struct i2c_softc *sc)
 	retry = 1000;
 	while (retry --) {
 		if (READ1(sc, I2C_IBSR) & IBSR_TCF) {
-			if (sc->ibif == 1)
+			if (READ1(sc, I2C_IBSR) & IBSR_IBIF) {
+				WRITE1(sc, I2C_IBSR, IBSR_IBIF);
 				return (IIC_NOERR);
+			}
 		}
 		DELAY(10);
 	}
@@ -265,8 +245,6 @@ i2c_repeated_start(device_t dev, u_char 
 
 	DELAY(10);
 
-	sc->ibif = 0;
-
 	/* Write target address - LSB is R/W bit */
 	WRITE1(sc, I2C_IBDR, slave);
 
@@ -310,8 +288,6 @@ i2c_start(device_t dev, u_char slave, in
 	reg |= (IBCR_TXRX);
 	WRITE1(sc, I2C_IBCR, reg);
 
-	sc->ibif = 0;
-
 	/* Write target address - LSB is R/W bit */
 	WRITE1(sc, I2C_IBDR, slave);
 
@@ -407,7 +383,6 @@ i2c_read(device_t dev, char *buf, int le
 			WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_MSSL);
 
 		/* dummy read */
-		sc->ibif = 0;
 		READ1(sc, I2C_IBDR);
 		DELAY(1000);
 	}
@@ -430,7 +405,6 @@ i2c_read(device_t dev, char *buf, int le
 			WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_NOACK);
 		}
 
-		sc->ibif = 0;
 		*buf++ = READ1(sc, I2C_IBDR);
 		(*read)++;
 	}
@@ -453,7 +427,6 @@ i2c_write(device_t dev, const char *buf,
 
 	mtx_lock(&sc->mutex);
 	while (*sent < len) {
-		sc->ibif = 0;
 
 		WRITE1(sc, I2C_IBDR, *buf++);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402271813.s1RID7re097064>