lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i2c: davinci: preparation for switch to common clock framework

Browse Source 
As a first step towards migrating davinci platforms to use common clock
framework, replace all instances of clk_enable() with clk_prepare_enable()
and clk_disable() with clk_disable_unprepare(). Until the platform is
switched to use the CONFIG_HAVE_CLK_PREPARE Kconfig variable, this just
adds a might_sleep() call and would work without any issues.

This will make it easy later to switch to common clk based implementation
of clk driver from DaVinci specific driver.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Murali Karicheri
2012-08-30 18:10:36 +00:00
committed by Wolfram Sang
parent c5d3cd6dc2
commit 2bdbfa9c4a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/i2c/busses/i2c-davinci.c
View File

@@ -704,7 +704,7 @@ static int davinci_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->base = ioremap(mem->start, resource_size(mem)); dev->base = ioremap(mem->start, resource_size(mem));
if (!dev->base) { if (!dev->base) {
@@ -751,7 +751,7 @@ err_free_irq:
err_unuse_clocks: err_unuse_clocks:
iounmap(dev->base); iounmap(dev->base);
err_mem_ioremap: err_mem_ioremap:
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:
@@ -775,7 +775,7 @@ static int davinci_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;
@@ -797,7 +797,7 @@ static int davinci_i2c_suspend(struct device *dev)
/* put I2C into reset */ /* put I2C into reset */
davinci_i2c_reset_ctrl(i2c_dev, 0); davinci_i2c_reset_ctrl(i2c_dev, 0);
clk_disable(i2c_dev->clk); clk_disable_unprepare(i2c_dev->clk);
return 0; return 0;
} }
@@ -807,7 +807,7 @@ static int davinci_i2c_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct davinci_i2c_dev *i2c_dev = platform_get_drvdata(pdev); struct davinci_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
clk_enable(i2c_dev->clk); clk_prepare_enable(i2c_dev->clk);
/* take I2C out of reset */ /* take I2C out of reset */
davinci_i2c_reset_ctrl(i2c_dev, 1); davinci_i2c_reset_ctrl(i2c_dev, 1);