lkml.org 
[lkml]   [2012]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] i2c: designware: Add clk_{un}prepare() support
Date
clk_{un}prepare is mandatory for platforms using common clock framework. Since
this driver is used by SPEAr platform, which supports common clock framework,
add clk_{un}prepare() support for designware i2c.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
---
drivers/i2c/busses/i2c-designware-platdrv.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 76bf108..7b50eec 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -97,13 +97,20 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dev);

dev->clk = clk_get(&pdev->dev, NULL);
- dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;
-
if (IS_ERR(dev->clk)) {
r = -ENODEV;
goto err_free_mem;
}
- clk_enable(dev->clk);
+
+ r = clk_prepare(dev->clk);
+ if (r)
+ goto err_put_clk;
+
+ r = clk_enable(dev->clk);
+ if (r)
+ goto err_unprepare_clk;
+
+ dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;

dev->functionality =
I2C_FUNC_I2C |
@@ -181,6 +188,9 @@ err_iounmap:
iounmap(dev->base);
err_unuse_clocks:
clk_disable(dev->clk);
+err_unprepare_clk:
+ clk_unprepare(dev->clk);
+err_put_clk:
clk_put(dev->clk);
dev->clk = NULL;
err_free_mem:
@@ -203,6 +213,7 @@ static int __devexit dw_i2c_remove(struct platform_device *pdev)
put_device(&pdev->dev);

clk_disable(dev->clk);
+ clk_unprepare(dev->clk);
clk_put(dev->clk);
dev->clk = NULL;

@@ -230,6 +241,7 @@ static int dw_i2c_suspend(struct device *dev)
struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev);

clk_disable(i_dev->clk);
+ clk_unprepare(i_dev->clk);

return 0;
}
@@ -239,6 +251,7 @@ static int dw_i2c_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev);

+ clk_prepare(i_dev->clk);
clk_enable(i_dev->clk);
i2c_dw_init(i_dev);

--
1.7.9


\
 
 \ /
  Last update: 2012-04-17 11:11    [W:0.278 / U:0.220 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site