| Message ID | 1346350236-11105-1-git-send-email-m-karicheri2@ti.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Thu, Aug 30, 2012 at 06:10:36PM -0000, m-karicheri2@ti.com wrote: > 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> Subject had "i2c:clk" where "i2c: davinci" would be more precise. Fixed that and pushed to -next. Thanks, Wolfram
>> -----Original Message----- >> From: Wolfram Sang [mailto:w.sang@pengutronix.de] >> Sent: Thursday, September 13, 2012 5:30 AM >> To: Karicheri, Muralidharan >> Cc: Nori, Sekhar; Hilman, Kevin; khali@linux-fr.org; ben-linux@fluff.org; davinci-linux- >> open-source@linux.davincidsp.com; linux-i2c@vger.kernel.org; linux- >> kernel@vger.kernel.org >> Subject: Re: i2c:clk: preparation for switch to common clock framework >> >> On Thu, Aug 30, 2012 at 06:10:36PM -0000, m-karicheri2@ti.com wrote: >> > 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> >> >> Subject had "i2c:clk" where "i2c: davinci" would be more precise. >> >> Fixed that and pushed to -next. >> >> Thanks, >> >> Wolfram Wolfram, Thanks for pushing this to -next. Greatly appreciated. Murali >> >> -- >> Pengutronix e.K. | Wolfram Sang | >> Industrial Linux Solutions | http://www.pengutronix.de/ |
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 79b4bcb..8e47ec1 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -681,7 +681,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) r = -ENODEV; goto err_free_mem; } - clk_enable(dev->clk); + clk_prepare_enable(dev->clk); dev->base = ioremap(mem->start, resource_size(mem)); if (!dev->base) { @@ -726,7 +726,7 @@ err_free_irq: err_unuse_clocks: iounmap(dev->base); err_mem_ioremap: - clk_disable(dev->clk); + clk_disable_unprepare(dev->clk); clk_put(dev->clk); dev->clk = NULL; err_free_mem: @@ -750,7 +750,7 @@ static int davinci_i2c_remove(struct platform_device *pdev) i2c_del_adapter(&dev->adapter); put_device(&pdev->dev); - clk_disable(dev->clk); + clk_disable_unprepare(dev->clk); clk_put(dev->clk); dev->clk = NULL; @@ -772,7 +772,7 @@ static int davinci_i2c_suspend(struct device *dev) /* put I2C into reset */ davinci_i2c_reset_ctrl(i2c_dev, 0); - clk_disable(i2c_dev->clk); + clk_disable_unprepare(i2c_dev->clk); return 0; } @@ -782,7 +782,7 @@ static int davinci_i2c_resume(struct device *dev) struct platform_device *pdev = to_platform_device(dev); 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 */ davinci_i2c_reset_ctrl(i2c_dev, 1);
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> --- drivers/i2c/busses/i2c-davinci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)