projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ef5ca19
)
i2c: imx: add clk_prepare/clk_unprepare
author
Richard Zhao
<richard.zhao@linaro.org>
Tue, 15 Nov 2011 06:48:08 +0000
(14:48 +0800)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Wed, 1 Feb 2012 13:29:31 +0000
(14:29 +0100)
It's for migrating to generic clk framework API.
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
drivers/i2c/busses/i2c-imx.c
patch
|
blob
|
history
diff --git
a/drivers/i2c/busses/i2c-imx.c
b/drivers/i2c/busses/i2c-imx.c
index
58832e5
..
8d1ab6f
100644
(file)
--- a/
drivers/i2c/busses/i2c-imx.c
+++ b/
drivers/i2c/busses/i2c-imx.c
@@
-196,7
+196,7
@@
static int i2c_imx_start(struct imx_i2c_struct *i2c_imx)
dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
- clk_enable(i2c_imx->clk);
+ clk_
prepare_
enable(i2c_imx->clk);
writeb(i2c_imx->ifdr, i2c_imx->base + IMX_I2C_IFDR);
/* Enable I2C controller */
writeb(0, i2c_imx->base + IMX_I2C_I2SR);
@@
-245,7
+245,7
@@
static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
/* Disable I2C controller */
writeb(0, i2c_imx->base + IMX_I2C_I2CR);
- clk_disable(i2c_imx->clk);
+ clk_disable
_unprepare
(i2c_imx->clk);
}
static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,