diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2014-11-17 10:07:43 -0500 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-11-25 11:18:58 -0500 |
| commit | 7263bd39251e6926ca7fa5591679b26577fdaccb (patch) | |
| tree | 07906f6209832da32b2667cab921849eb2302f3a | |
| parent | 21cf3318d675b6ceeb5a3ed82ffe467a2b6eaee4 (diff) | |
mfd: tc6387xb: prepare/unprepare clocks
Change clk_enable/disable() calls to clk_prepare_enable() and
clk_disable_unprepare().
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| -rw-r--r-- | drivers/mfd/tc6387xb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c index e71f88000ae5..85fab3729102 100644 --- a/drivers/mfd/tc6387xb.c +++ b/drivers/mfd/tc6387xb.c | |||
| @@ -52,7 +52,7 @@ static int tc6387xb_suspend(struct platform_device *dev, pm_message_t state) | |||
| 52 | 52 | ||
| 53 | if (pdata && pdata->suspend) | 53 | if (pdata && pdata->suspend) |
| 54 | pdata->suspend(dev); | 54 | pdata->suspend(dev); |
| 55 | clk_disable(tc6387xb->clk32k); | 55 | clk_disable_unprepare(tc6387xb->clk32k); |
| 56 | 56 | ||
| 57 | return 0; | 57 | return 0; |
| 58 | } | 58 | } |
| @@ -62,7 +62,7 @@ static int tc6387xb_resume(struct platform_device *dev) | |||
| 62 | struct tc6387xb *tc6387xb = platform_get_drvdata(dev); | 62 | struct tc6387xb *tc6387xb = platform_get_drvdata(dev); |
| 63 | struct tc6387xb_platform_data *pdata = dev_get_platdata(&dev->dev); | 63 | struct tc6387xb_platform_data *pdata = dev_get_platdata(&dev->dev); |
| 64 | 64 | ||
| 65 | clk_enable(tc6387xb->clk32k); | 65 | clk_prepare_enable(tc6387xb->clk32k); |
| 66 | if (pdata && pdata->resume) | 66 | if (pdata && pdata->resume) |
| 67 | pdata->resume(dev); | 67 | pdata->resume(dev); |
| 68 | 68 | ||
| @@ -100,7 +100,7 @@ static int tc6387xb_mmc_enable(struct platform_device *mmc) | |||
| 100 | struct platform_device *dev = to_platform_device(mmc->dev.parent); | 100 | struct platform_device *dev = to_platform_device(mmc->dev.parent); |
| 101 | struct tc6387xb *tc6387xb = platform_get_drvdata(dev); | 101 | struct tc6387xb *tc6387xb = platform_get_drvdata(dev); |
| 102 | 102 | ||
| 103 | clk_enable(tc6387xb->clk32k); | 103 | clk_prepare_enable(tc6387xb->clk32k); |
| 104 | 104 | ||
| 105 | tmio_core_mmc_enable(tc6387xb->scr + 0x200, 0, | 105 | tmio_core_mmc_enable(tc6387xb->scr + 0x200, 0, |
| 106 | tc6387xb_mmc_resources[0].start & 0xfffe); | 106 | tc6387xb_mmc_resources[0].start & 0xfffe); |
| @@ -113,7 +113,7 @@ static int tc6387xb_mmc_disable(struct platform_device *mmc) | |||
| 113 | struct platform_device *dev = to_platform_device(mmc->dev.parent); | 113 | struct platform_device *dev = to_platform_device(mmc->dev.parent); |
| 114 | struct tc6387xb *tc6387xb = platform_get_drvdata(dev); | 114 | struct tc6387xb *tc6387xb = platform_get_drvdata(dev); |
| 115 | 115 | ||
| 116 | clk_disable(tc6387xb->clk32k); | 116 | clk_disable_unprepare(tc6387xb->clk32k); |
| 117 | 117 | ||
| 118 | return 0; | 118 | return 0; |
| 119 | } | 119 | } |
| @@ -214,7 +214,7 @@ static int tc6387xb_remove(struct platform_device *dev) | |||
| 214 | mfd_remove_devices(&dev->dev); | 214 | mfd_remove_devices(&dev->dev); |
| 215 | iounmap(tc6387xb->scr); | 215 | iounmap(tc6387xb->scr); |
| 216 | release_resource(&tc6387xb->rscr); | 216 | release_resource(&tc6387xb->rscr); |
| 217 | clk_disable(tc6387xb->clk32k); | 217 | clk_disable_unprepare(tc6387xb->clk32k); |
| 218 | clk_put(tc6387xb->clk32k); | 218 | clk_put(tc6387xb->clk32k); |
| 219 | kfree(tc6387xb); | 219 | kfree(tc6387xb); |
| 220 | 220 | ||
