d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not setup interrupt handler (polling is used).

Browse Source
This commit is contained in:
Ruslan Bukin 2014-02-27 18:13:07 +00:00
parent 5439648913
commit 9e04ee7729
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/arm/freescale/vybrid/vf_i2c.c
View File

@ -104,11 +104,9 @@ struct i2c_softc {
struct resource *res[2]; struct resource *res[2];
bus_space_tag_t bst; bus_space_tag_t bst;
bus_space_handle_t bsh; bus_space_handle_t bsh;
void *ih;
device_t dev; device_t dev;
device_t iicbus; device_t iicbus;
struct mtx mutex; struct mtx mutex;
int ibif;
}; };
static struct resource_spec i2c_spec[] = { static struct resource_spec i2c_spec[] = {
@ -117,19 +115,6 @@ static struct resource_spec i2c_spec[] = {
{ -1, 0 } { -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 static int
i2c_probe(device_t dev) i2c_probe(device_t dev)
{ {
@ -148,7 +133,6 @@ static int
i2c_attach(device_t dev) i2c_attach(device_t dev)
{ {
struct i2c_softc *sc; struct i2c_softc *sc;
int err;
sc = device_get_softc(dev); sc = device_get_softc(dev);
sc->dev = dev; sc->dev = dev;
@ -164,14 +148,6 @@ i2c_attach(device_t dev)
sc->bst = rman_get_bustag(sc->res[0]); sc->bst = rman_get_bustag(sc->res[0]);
sc->bsh = rman_get_bushandle(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); WRITE1(sc, I2C_IBIC, IBIC_BIIE);
sc->iicbus = device_add_child(dev, "iicbus", -1); sc->iicbus = device_add_child(dev, "iicbus", -1);
@ -194,8 +170,10 @@ wait_for_iif(struct i2c_softc *sc)
retry = 1000; retry = 1000;
while (retry --) { while (retry --) {
if (sc->ibif == 1) if (READ1(sc, I2C_IBSR) & IBSR_IBIF) {
WRITE1(sc, I2C_IBSR, IBSR_IBIF);
return (IIC_NOERR); return (IIC_NOERR);
}
DELAY(10); DELAY(10);
} }
@ -227,8 +205,10 @@ wait_for_icf(struct i2c_softc *sc)
retry = 1000; retry = 1000;
while (retry --) { while (retry --) {
if (READ1(sc, I2C_IBSR) & IBSR_TCF) { 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); return (IIC_NOERR);
}
} }
DELAY(10); DELAY(10);
} }
@ -265,8 +245,6 @@ i2c_repeated_start(device_t dev, u_char slave, int timeout)
DELAY(10); DELAY(10);
sc->ibif = 0;
/* Write target address - LSB is R/W bit */ /* Write target address - LSB is R/W bit */
WRITE1(sc, I2C_IBDR, slave); WRITE1(sc, I2C_IBDR, slave);
@ -310,8 +288,6 @@ i2c_start(device_t dev, u_char slave, int timeout)
reg |= (IBCR_TXRX); reg |= (IBCR_TXRX);
WRITE1(sc, I2C_IBCR, reg); WRITE1(sc, I2C_IBCR, reg);
sc->ibif = 0;
/* Write target address - LSB is R/W bit */ /* Write target address - LSB is R/W bit */
WRITE1(sc, I2C_IBDR, slave); WRITE1(sc, I2C_IBDR, slave);
@ -407,7 +383,6 @@ i2c_read(device_t dev, char *buf, int len, int *read, int last, int delay)
WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_MSSL); WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_MSSL);
/* dummy read */ /* dummy read */
sc->ibif = 0;
READ1(sc, I2C_IBDR); READ1(sc, I2C_IBDR);
DELAY(1000); DELAY(1000);
} }
@ -430,7 +405,6 @@ i2c_read(device_t dev, char *buf, int len, int *read, int last, int delay)
WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_NOACK); WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_NOACK);
} }
sc->ibif = 0;
*buf++ = READ1(sc, I2C_IBDR); *buf++ = READ1(sc, I2C_IBDR);
(*read)++; (*read)++;
} }
@ -453,7 +427,6 @@ i2c_write(device_t dev, const char *buf, int len, int *sent, int timeout)
mtx_lock(&sc->mutex); mtx_lock(&sc->mutex);
while (*sent < len) { while (*sent < len) {
sc->ibif = 0;
WRITE1(sc, I2C_IBDR, *buf++); WRITE1(sc, I2C_IBDR, *buf++);