Commit e1fac69f authored by Viresh Kumar's avatar Viresh Kumar Committed by Wolfram Sang

i2c: designware: Add clk_{un}prepare() support

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: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 3bf3b289
...@@ -96,7 +96,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev) ...@@ -96,7 +96,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
r = -ENODEV; r = -ENODEV;
goto err_free_mem; goto err_free_mem;
} }
clk_enable(dev->clk); clk_prepare_enable(dev->clk);
dev->functionality = dev->functionality =
I2C_FUNC_I2C | I2C_FUNC_I2C |
...@@ -156,7 +156,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev) ...@@ -156,7 +156,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
err_iounmap: err_iounmap:
iounmap(dev->base); iounmap(dev->base);
err_unuse_clocks: err_unuse_clocks:
clk_disable(dev->clk); clk_disable_unprepare(dev->clk);
clk_put(dev->clk); clk_put(dev->clk);
dev->clk = NULL; dev->clk = NULL;
err_free_mem: err_free_mem:
...@@ -178,7 +178,7 @@ static int __devexit dw_i2c_remove(struct platform_device *pdev) ...@@ -178,7 +178,7 @@ static int __devexit dw_i2c_remove(struct platform_device *pdev)
i2c_del_adapter(&dev->adapter); i2c_del_adapter(&dev->adapter);
put_device(&pdev->dev); put_device(&pdev->dev);
clk_disable(dev->clk); clk_disable_unprepare(dev->clk);
clk_put(dev->clk); clk_put(dev->clk);
dev->clk = NULL; dev->clk = NULL;
...@@ -205,7 +205,7 @@ static int dw_i2c_suspend(struct device *dev) ...@@ -205,7 +205,7 @@ static int dw_i2c_suspend(struct device *dev)
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev); struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev);
clk_disable(i_dev->clk); clk_disable_unprepare(i_dev->clk);
return 0; return 0;
} }
...@@ -215,7 +215,7 @@ static int dw_i2c_resume(struct device *dev) ...@@ -215,7 +215,7 @@ static int dw_i2c_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev); struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev);
clk_enable(i_dev->clk); clk_prepare_enable(i_dev->clk);
i2c_dw_init(i_dev); i2c_dw_init(i_dev);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment