Commit 71d679b8 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Lee Jones

mfd: t7l66xb: prepare/unprepare clocks

Change clk_enable/disable() calls to clk_prepare_enable() and
clk_disable_unprepare().
Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
parent 7263bd39
...@@ -87,7 +87,7 @@ static int t7l66xb_mmc_enable(struct platform_device *mmc) ...@@ -87,7 +87,7 @@ static int t7l66xb_mmc_enable(struct platform_device *mmc)
unsigned long flags; unsigned long flags;
u8 dev_ctl; u8 dev_ctl;
clk_enable(t7l66xb->clk32k); clk_prepare_enable(t7l66xb->clk32k);
spin_lock_irqsave(&t7l66xb->lock, flags); spin_lock_irqsave(&t7l66xb->lock, flags);
...@@ -118,7 +118,7 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc) ...@@ -118,7 +118,7 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc)
spin_unlock_irqrestore(&t7l66xb->lock, flags); spin_unlock_irqrestore(&t7l66xb->lock, flags);
clk_disable(t7l66xb->clk32k); clk_disable_unprepare(t7l66xb->clk32k);
return 0; return 0;
} }
...@@ -285,7 +285,7 @@ static int t7l66xb_suspend(struct platform_device *dev, pm_message_t state) ...@@ -285,7 +285,7 @@ static int t7l66xb_suspend(struct platform_device *dev, pm_message_t state)
if (pdata && pdata->suspend) if (pdata && pdata->suspend)
pdata->suspend(dev); pdata->suspend(dev);
clk_disable(t7l66xb->clk48m); clk_disable_unprepare(t7l66xb->clk48m);
return 0; return 0;
} }
...@@ -295,7 +295,7 @@ static int t7l66xb_resume(struct platform_device *dev) ...@@ -295,7 +295,7 @@ static int t7l66xb_resume(struct platform_device *dev)
struct t7l66xb *t7l66xb = platform_get_drvdata(dev); struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev); struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
clk_enable(t7l66xb->clk48m); clk_prepare_enable(t7l66xb->clk48m);
if (pdata && pdata->resume) if (pdata && pdata->resume)
pdata->resume(dev); pdata->resume(dev);
...@@ -369,7 +369,7 @@ static int t7l66xb_probe(struct platform_device *dev) ...@@ -369,7 +369,7 @@ static int t7l66xb_probe(struct platform_device *dev)
goto err_ioremap; goto err_ioremap;
} }
clk_enable(t7l66xb->clk48m); clk_prepare_enable(t7l66xb->clk48m);
if (pdata && pdata->enable) if (pdata && pdata->enable)
pdata->enable(dev); pdata->enable(dev);
...@@ -414,9 +414,9 @@ static int t7l66xb_remove(struct platform_device *dev) ...@@ -414,9 +414,9 @@ static int t7l66xb_remove(struct platform_device *dev)
int ret; int ret;
ret = pdata->disable(dev); ret = pdata->disable(dev);
clk_disable(t7l66xb->clk48m); clk_disable_unprepare(t7l66xb->clk48m);
clk_put(t7l66xb->clk48m); clk_put(t7l66xb->clk48m);
clk_disable(t7l66xb->clk32k); clk_disable_unprepare(t7l66xb->clk32k);
clk_put(t7l66xb->clk32k); clk_put(t7l66xb->clk32k);
t7l66xb_detach_irq(dev); t7l66xb_detach_irq(dev);
iounmap(t7l66xb->scr); iounmap(t7l66xb->scr);
......
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