summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-03-21 10:36:12 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:40 +0200
commit83f9cd3abfe1c8689453e2f8e5c39de91c3794d7 (patch)
treeb8be80aba77a7510353fe4042f5f678e969d44d4 /drivers/i2c
parentc64437840cebe0078494bc84056b5e561752e746 (diff)
i2c: nomadic-i2c driver updates for clock and power, busy management
Moreover driver documentation is added in DocBook Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-nomadik.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 5267ab93d55..486f392825f 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -267,6 +267,9 @@ static int init_hw(struct nmk_i2c_dev *dev)
dev->cli.operation = I2C_NO_OPERATION;
exit:
+ clk_disable(dev->clk);
+
+ udelay(I2C_DELAY);
return stat;
}
@@ -634,6 +637,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
clk_enable(dev->clk);
+ dev->busy = true;
+
status = init_hw(dev);
if (status)
goto out;
@@ -1047,6 +1052,7 @@ static struct platform_driver nmk_i2c_driver = {
},
.probe = nmk_i2c_probe,
.remove = __devexit_p(nmk_i2c_remove),
+ .suspend = nmk_i2c_suspend,
};
static int __init nmk_i2c_init(void)