Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / i2c / busses / i2c-rk30.h

diff --git a/drivers/i2c/busses/i2c-rk30.h b/drivers/i2c/busses/i2c-rk30.h
index 3e6ea7adfd137b45d9cd0ff4c6fe631e4c2acb7a..d826d5eac4d1ac745f90959c533afe09bc25ddcd 100755 (executable)
--- a/drivers/i2c/busses/i2c-rk30.h
+++ b/drivers/i2c/busses/i2c-rk30.h
@@ -72,7 +72,7 @@ struct rk30_i2c {
         };
         union {
                unsigned int            msg_idx;
-               unsigned int            error;
+               int                     error;
         };
        unsigned int            msg_ptr;
 
@@ -105,6 +105,7 @@ struct rk30_i2c {
 
         void (*i2c_init_hw)(struct rk30_i2c *, unsigned long scl_rate);
         void (*i2c_set_clk)(struct rk30_i2c *, unsigned long);
+        int (*check_idle)(void);
         irqreturn_t (*i2c_irq)(int, void *);
 };
 void i2c_adap_sel(struct rk30_i2c *i2c, int nr, int adap_type);