Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/rockchip Actually set slave addr / reg. Wait fo...



details:   https://anonhg.NetBSD.org/src/rev/8f1980cff576
branches:  trunk
changeset: 805373:8f1980cff576
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Dec 30 18:57:36 2014 +0000

description:
Actually set slave addr / reg. Wait for start irq after sending start before
transferring data. Add RKIIC_DEBUG kernel option.

diffstat:

 sys/arch/arm/rockchip/files.rockchip    |   3 +-
 sys/arch/arm/rockchip/rockchip_i2c.c    |  89 +++++++++++++++++---------------
 sys/arch/arm/rockchip/rockchip_i2creg.h |   4 +-
 3 files changed, 51 insertions(+), 45 deletions(-)

diffs (225 lines):

diff -r 7708aa1f454d -r 8f1980cff576 sys/arch/arm/rockchip/files.rockchip
--- a/sys/arch/arm/rockchip/files.rockchip      Tue Dec 30 18:52:47 2014 +0000
+++ b/sys/arch/arm/rockchip/files.rockchip      Tue Dec 30 18:57:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.rockchip,v 1.4 2014/12/30 17:15:31 jmcneill Exp $
+#      $NetBSD: files.rockchip,v 1.5 2014/12/30 18:57:36 jmcneill Exp $
 #
 # Configuration info for Rockchip ARM Peripherals
 #
@@ -49,3 +49,4 @@
 
 # Debugging parameters
 defflag opt_rockchip.h                 ROCKCHIP_CLOCK_DEBUG
+defflag opt_rkiic.h                    RKIIC_DEBUG
diff -r 7708aa1f454d -r 8f1980cff576 sys/arch/arm/rockchip/rockchip_i2c.c
--- a/sys/arch/arm/rockchip/rockchip_i2c.c      Tue Dec 30 18:52:47 2014 +0000
+++ b/sys/arch/arm/rockchip/rockchip_i2c.c      Tue Dec 30 18:57:36 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_i2c.c,v 1.2 2014/12/30 17:28:11 jmcneill Exp $ */
+/* $NetBSD: rockchip_i2c.c,v 1.3 2014/12/30 18:57:36 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,9 +27,10 @@
  */
 
 #include "locators.h"
+#include "opt_rkiic.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rockchip_i2c.c,v 1.2 2014/12/30 17:28:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rockchip_i2c.c,v 1.3 2014/12/30 18:57:36 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -181,7 +182,7 @@
     const void *cmdbuf, size_t cmdlen, void *buf, size_t len, int flags)
 {
        struct rkiic_softc *sc = priv;
-       uint32_t con;
+       uint32_t con, ien;
        u_int mode;
        int error;
 
@@ -191,32 +192,49 @@
                flags |= I2C_F_POLL;
        }
 
+       if (cmdlen != 0 && cmdlen != 1)
+               return EINVAL;
+
        error = rkiic_set_rate(sc, RKIIC_CLOCK_RATE);
        if (error)
                return error;
 
-       if (cmdlen > 0) {
+       I2C_WRITE(sc, I2C_MRXADDR_REG, I2C_MRXADDR_ADDLVLD |
+           __SHIFTIN(addr, I2C_MRXADDR_SADDR));
+
+       if (cmdlen == 1) {
+               const uint8_t reg = *(const uint8_t *)cmdbuf;
                if (I2C_OP_READ_P(op)) {
-                       mode = I2C_CON_MODE_RRX;
+                       mode = I2C_CON_MODE_TRX;
                } else {
-                       mode = I2C_CON_MODE_TRX;
+                       mode = I2C_CON_MODE_TX;
                }
+               I2C_WRITE(sc, I2C_MRXRADDR_REG, I2C_MRXRADDR_SRADDLVLD |
+                   __SHIFTIN(reg, I2C_MRXRADDR_SRADDR));
        } else {
                if (I2C_OP_READ_P(op)) {
                        mode = I2C_CON_MODE_RX;
                } else {
                        mode = I2C_CON_MODE_TX;
                }
+               I2C_WRITE(sc, I2C_MRXRADDR_REG, 0);
        }
-       con = I2C_CON_START | I2C_CON_EN | __SHIFTIN(mode, I2C_CON_MODE);
+
+       sc->sc_intr_ipd = 0;
 
+       ien = I2C_INT_START | (I2C_OP_READ_P(op) ? I2C_INT_MBRF : I2C_INT_MBTF);
+       I2C_WRITE(sc, I2C_IEN_REG, ien);
+
+       con = I2C_CON_START | I2C_CON_EN | I2C_CON_ACK |
+           __SHIFTIN(mode, I2C_CON_MODE);
        I2C_WRITE(sc, I2C_CON_REG, con);
 
-       if (cmdlen > 0) {
-               error = rkiic_write(sc, addr, cmdbuf, cmdlen, flags);
-               if (error) {
-                       goto done;
-               }
+       error = rkiic_wait(sc, I2C_INT_START, hz, flags);
+       if (error) {
+#ifdef RKIIC_DEBUG
+               device_printf(sc->sc_dev, "timeout waiting for start\n");
+#endif
+               goto done;
        }
 
        if (I2C_OP_READ_P(op)) {
@@ -225,11 +243,12 @@
                error = rkiic_write(sc, addr, buf, len, flags);
        }
 
-done:
        if (I2C_OP_STOP_P(op)) {
                I2C_WRITE(sc, I2C_CON_REG, I2C_CON_STOP);
        }
 
+done:
+       I2C_WRITE(sc, I2C_IEN_REG, 0);
        return error;
 }
 
@@ -246,14 +265,14 @@
        if (flags & I2C_F_POLL) {
                retry = (timeout / hz) * 1000000;
                while (retry > 0) {
-                       if (I2C_READ(sc, I2C_IPD_REG) & mask)
+                       sc->sc_intr_ipd |= I2C_READ(sc, I2C_IPD_REG);
+                       if (sc->sc_intr_ipd & mask)
                                return 0;
                        delay(1);
                        --retry;
                }
        } else {
                retry = timeout / hz;
-
                while (retry > 0) {
                        error = cv_timedwait(&sc->sc_cv, &sc->sc_lock, hz);
                        if (error && error != EWOULDBLOCK)
@@ -278,17 +297,15 @@
        if (buflen > 32)
                return EINVAL;
 
-       sc->sc_intr_ipd = 0;
-
-       if (!(flags & I2C_F_POLL)) {
-               I2C_WRITE(sc, I2C_IEN_REG, I2C_INT_MBRF);
-       }
-
        I2C_WRITE(sc, I2C_MRXCNT_REG, __SHIFTIN(buflen, I2C_MRXCNT_COUNT));
 
        error = rkiic_wait(sc, I2C_INT_MBRF, hz, flags);
-       if (error)
-               goto done;
+       if (error) {
+#ifdef RKIIC_DEBUG
+               device_printf(sc->sc_dev, "read timeout\n");
+#endif
+               return error;
+       }
 
        for (off = 0, resid = buflen; off < 8 && resid > 0; off++) {
                const uint32_t data = I2C_READ(sc, I2C_RXDATA_REG(off));
@@ -297,12 +314,7 @@
                }
        }
 
-done:
-       if (!(flags & I2C_F_POLL)) {
-               I2C_WRITE(sc, I2C_IEN_REG, 0);
-       }
-
-       return error;
+       return 0;
 }
 
 static int
@@ -316,12 +328,6 @@
        if (buflen > 32)
                return EINVAL;
 
-       sc->sc_intr_ipd = 0;
-
-       if (!(flags & I2C_F_POLL)) {
-               I2C_WRITE(sc, I2C_IEN_REG, I2C_INT_MBTF);
-       }
-
        for (off = 0, resid = buflen; off < 8 && resid > 0; off++) {
                uint32_t data = 0;
                for (byte = 0; byte < 4 && resid > 0; byte++, resid--) {
@@ -333,15 +339,14 @@
        I2C_WRITE(sc, I2C_MTXCNT_REG, __SHIFTIN(buflen, I2C_MTXCNT_COUNT));
 
        error = rkiic_wait(sc, I2C_INT_MBTF, hz, flags);
-       if (error)
-               goto done;
-
-done:
-       if (!(flags & I2C_F_POLL)) {
-               I2C_WRITE(sc, I2C_IEN_REG, 0);
+       if (error) {
+#ifdef RKIIC_DEBUG
+               device_printf(sc->sc_dev, "write timeout\n");
+#endif
+               return error;
        }
 
-       return error;
+       return 0;
 
 }
 
diff -r 7708aa1f454d -r 8f1980cff576 sys/arch/arm/rockchip/rockchip_i2creg.h
--- a/sys/arch/arm/rockchip/rockchip_i2creg.h   Tue Dec 30 18:52:47 2014 +0000
+++ b/sys/arch/arm/rockchip/rockchip_i2creg.h   Tue Dec 30 18:57:36 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_i2creg.h,v 1.1 2014/12/30 17:15:31 jmcneill Exp $ */
+/* $NetBSD: rockchip_i2creg.h,v 1.2 2014/12/30 18:57:36 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -63,7 +63,7 @@
 #define I2C_MRXRADDR_SRADDHVLD __BIT(26)
 #define I2C_MRXRADDR_SRADDMVLD __BIT(25)
 #define I2C_MRXRADDR_SRADDLVLD __BIT(24)
-#define I2C_MRXADDR_SADDR      __BITS(23,0)
+#define I2C_MRXRADDR_SRADDR    __BITS(23,0)
 
 #define I2C_MTXCNT_COUNT       __BITS(5,0)
 



Home | Main Index | Thread Index | Old Index