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.c

diff --git a/drivers/i2c/busses/i2c-rk30.c b/drivers/i2c/busses/i2c-rk30.c
index bc0cc1054e9e74d9d82d28db7c372ea5606a78a2..fbdda127868552164d4d5240e804972c55e5362e 100755 (executable)
--- a/drivers/i2c/busses/i2c-rk30.c
+++ b/drivers/i2c/busses/i2c-rk30.c
@@ -100,6 +100,9 @@ static int rk30_i2c_probe(struct platform_device *pdev)
 
         if(pdata->io_init)
                pdata->io_init();
+        if(pdata->check_idle){
+                i2c->check_idle = pdata->check_idle;
+        }
 
        strlcpy(i2c->adap.name, "rk30_i2c", sizeof(i2c->adap.name));
        i2c->adap.owner   = THIS_MODULE;
@@ -124,7 +127,7 @@ static int rk30_i2c_probe(struct platform_device *pdev)
 
        i2c_dbg(&pdev->dev, "clock source %p\n", i2c->clk);
 
-       //clk_enable(i2c->clk);
+       clk_enable(i2c->clk);
 
        /* map the registers */