i2c: omap: cleanup register definitions

Delete STAT_AD0 mask as unrelated to current IP (omap1?).
Delete DEBUG conditional around SYSTEST masks group.
Add SYSTEST functional mode masks for SCL and SDA.
Add STAT_BF mask.

Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
Tested-by: Felipe Balbi <balbi@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 26942c159de1252c867d1b63ba7f6820c60c1402..5e79c0d294cd117fb3e9305bce4b5e940739f04d 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -98,7 +98,7 @@ enum {
 #define OMAP_I2C_STAT_ROVR     (1 << 11)       /* Receive overrun */
 #define OMAP_I2C_STAT_XUDF     (1 << 10)       /* Transmit underflow */
 #define OMAP_I2C_STAT_AAS      (1 << 9)        /* Address as slave */
-#define OMAP_I2C_STAT_AD0      (1 << 8)        /* Address zero */
+#define OMAP_I2C_STAT_BF       (1 << 8)        /* Bus Free */
 #define OMAP_I2C_STAT_XRDY     (1 << 4)        /* Transmit data ready */
 #define OMAP_I2C_STAT_RRDY     (1 << 3)        /* Receive data ready */
 #define OMAP_I2C_STAT_ARDY     (1 << 2)        /* Register access ready */
@@ -146,16 +146,20 @@ enum {
 #define OMAP_I2C_SCLH_HSSCLH   8
 
 /* I2C System Test Register (OMAP_I2C_SYSTEST): */
-#ifdef DEBUG
 #define OMAP_I2C_SYSTEST_ST_EN         (1 << 15)       /* System test enable */
 #define OMAP_I2C_SYSTEST_FREE          (1 << 14)       /* Free running mode */
 #define OMAP_I2C_SYSTEST_TMODE_MASK    (3 << 12)       /* Test mode select */
 #define OMAP_I2C_SYSTEST_TMODE_SHIFT   (12)            /* Test mode select */
+/* Functional mode */
+#define OMAP_I2C_SYSTEST_SCL_I_FUNC    (1 << 8)        /* SCL line input value */
+#define OMAP_I2C_SYSTEST_SCL_O_FUNC    (1 << 7)        /* SCL line output value */
+#define OMAP_I2C_SYSTEST_SDA_I_FUNC    (1 << 6)        /* SDA line input value */
+#define OMAP_I2C_SYSTEST_SDA_O_FUNC    (1 << 5)        /* SDA line output value */
+/* SDA/SCL IO mode */
 #define OMAP_I2C_SYSTEST_SCL_I         (1 << 3)        /* SCL line sense in */
 #define OMAP_I2C_SYSTEST_SCL_O         (1 << 2)        /* SCL line drive out */
 #define OMAP_I2C_SYSTEST_SDA_I         (1 << 1)        /* SDA line sense in */
 #define OMAP_I2C_SYSTEST_SDA_O         (1 << 0)        /* SDA line drive out */
-#endif
 
 /* OCP_SYSSTATUS bit definitions */
 #define SYSS_RESETDONE_MASK            (1 << 0)