aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2014-11-20 04:43:22 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2014-11-20 09:39:40 -0500
commit21961efa1381053633aed190fdaac21481fb6c12 (patch)
treece591d35aa8c219de94688e8d9b6952cf65f9681 /drivers/char
parent1e0bdad02583764e90671a2900920cffa3e9d605 (diff)
hwrng: atmel - use clk_prepapre_enable/_disable_unprepare
Use clk_prepare_enable/_disable_unprepare instead of clk_enable/disable to work properly with the CCF. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Peter Korsgaard <peter@korsgaard.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/hw_random/atmel-rng.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c
index 851bc7e20ad2..644ec4882206 100644
--- a/drivers/char/hw_random/atmel-rng.c
+++ b/drivers/char/hw_random/atmel-rng.c
@@ -67,7 +67,7 @@ static int atmel_trng_probe(struct platform_device *pdev)
67 if (IS_ERR(trng->clk)) 67 if (IS_ERR(trng->clk))
68 return PTR_ERR(trng->clk); 68 return PTR_ERR(trng->clk);
69 69
70 ret = clk_enable(trng->clk); 70 ret = clk_prepare_enable(trng->clk);
71 if (ret) 71 if (ret)
72 return ret; 72 return ret;
73 73
@@ -95,7 +95,7 @@ static int atmel_trng_remove(struct platform_device *pdev)
95 hwrng_unregister(&trng->rng); 95 hwrng_unregister(&trng->rng);
96 96
97 writel(TRNG_KEY, trng->base + TRNG_CR); 97 writel(TRNG_KEY, trng->base + TRNG_CR);
98 clk_disable(trng->clk); 98 clk_disable_unprepare(trng->clk);
99 99
100 return 0; 100 return 0;
101} 101}
@@ -105,7 +105,7 @@ static int atmel_trng_suspend(struct device *dev)
105{ 105{
106 struct atmel_trng *trng = dev_get_drvdata(dev); 106 struct atmel_trng *trng = dev_get_drvdata(dev);
107 107
108 clk_disable(trng->clk); 108 clk_disable_unprepare(trng->clk);
109 109
110 return 0; 110 return 0;
111} 111}
@@ -114,7 +114,7 @@ static int atmel_trng_resume(struct device *dev)
114{ 114{
115 struct atmel_trng *trng = dev_get_drvdata(dev); 115 struct atmel_trng *trng = dev_get_drvdata(dev);
116 116
117 return clk_enable(trng->clk); 117 return clk_prepare_enable(trng->clk);
118} 118}
119 119
120static const struct dev_pm_ops atmel_trng_pm_ops = { 120static const struct dev_pm_ops atmel_trng_pm_ops = {