diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2014-11-17 10:07:42 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-11-25 11:18:58 -0500 |
commit | 71d679b84ce8ca3207e547488f70c259575d2f2f (patch) | |
tree | a42b1e6d735c83347ee13365fca86b73e3788065 /drivers/mfd/t7l66xb.c | |
parent | 7263bd39251e6926ca7fa5591679b26577fdaccb (diff) |
mfd: t7l66xb: 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>
Diffstat (limited to 'drivers/mfd/t7l66xb.c')
-rw-r--r-- | drivers/mfd/t7l66xb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 9e04a7485981..439d905bb219 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c | |||
@@ -87,7 +87,7 @@ static int t7l66xb_mmc_enable(struct platform_device *mmc) | |||
87 | unsigned long flags; | 87 | unsigned long flags; |
88 | u8 dev_ctl; | 88 | u8 dev_ctl; |
89 | 89 | ||
90 | clk_enable(t7l66xb->clk32k); | 90 | clk_prepare_enable(t7l66xb->clk32k); |
91 | 91 | ||
92 | spin_lock_irqsave(&t7l66xb->lock, flags); | 92 | spin_lock_irqsave(&t7l66xb->lock, flags); |
93 | 93 | ||
@@ -118,7 +118,7 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc) | |||
118 | 118 | ||
119 | spin_unlock_irqrestore(&t7l66xb->lock, flags); | 119 | spin_unlock_irqrestore(&t7l66xb->lock, flags); |
120 | 120 | ||
121 | clk_disable(t7l66xb->clk32k); | 121 | clk_disable_unprepare(t7l66xb->clk32k); |
122 | 122 | ||
123 | return 0; | 123 | return 0; |
124 | } | 124 | } |
@@ -285,7 +285,7 @@ static int t7l66xb_suspend(struct platform_device *dev, pm_message_t state) | |||
285 | 285 | ||
286 | if (pdata && pdata->suspend) | 286 | if (pdata && pdata->suspend) |
287 | pdata->suspend(dev); | 287 | pdata->suspend(dev); |
288 | clk_disable(t7l66xb->clk48m); | 288 | clk_disable_unprepare(t7l66xb->clk48m); |
289 | 289 | ||
290 | return 0; | 290 | return 0; |
291 | } | 291 | } |
@@ -295,7 +295,7 @@ static int t7l66xb_resume(struct platform_device *dev) | |||
295 | struct t7l66xb *t7l66xb = platform_get_drvdata(dev); | 295 | struct t7l66xb *t7l66xb = platform_get_drvdata(dev); |
296 | struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev); | 296 | struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev); |
297 | 297 | ||
298 | clk_enable(t7l66xb->clk48m); | 298 | clk_prepare_enable(t7l66xb->clk48m); |
299 | if (pdata && pdata->resume) | 299 | if (pdata && pdata->resume) |
300 | pdata->resume(dev); | 300 | pdata->resume(dev); |
301 | 301 | ||
@@ -369,7 +369,7 @@ static int t7l66xb_probe(struct platform_device *dev) | |||
369 | goto err_ioremap; | 369 | goto err_ioremap; |
370 | } | 370 | } |
371 | 371 | ||
372 | clk_enable(t7l66xb->clk48m); | 372 | clk_prepare_enable(t7l66xb->clk48m); |
373 | 373 | ||
374 | if (pdata && pdata->enable) | 374 | if (pdata && pdata->enable) |
375 | pdata->enable(dev); | 375 | pdata->enable(dev); |
@@ -414,9 +414,9 @@ static int t7l66xb_remove(struct platform_device *dev) | |||
414 | int ret; | 414 | int ret; |
415 | 415 | ||
416 | ret = pdata->disable(dev); | 416 | ret = pdata->disable(dev); |
417 | clk_disable(t7l66xb->clk48m); | 417 | clk_disable_unprepare(t7l66xb->clk48m); |
418 | clk_put(t7l66xb->clk48m); | 418 | clk_put(t7l66xb->clk48m); |
419 | clk_disable(t7l66xb->clk32k); | 419 | clk_disable_unprepare(t7l66xb->clk32k); |
420 | clk_put(t7l66xb->clk32k); | 420 | clk_put(t7l66xb->clk32k); |
421 | t7l66xb_detach_irq(dev); | 421 | t7l66xb_detach_irq(dev); |
422 | iounmap(t7l66xb->scr); | 422 | iounmap(t7l66xb->scr); |