Skip to content

Commit

Permalink
hwrng: atmel - use clk_prepapre_enable/_disable_unprepare
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Boris Brezillon authored and Herbert Xu committed Nov 20, 2014
1 parent 1e0bdad commit 21961ef
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/char/hw_random/atmel-rng.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static int atmel_trng_probe(struct platform_device *pdev)
if (IS_ERR(trng->clk))
return PTR_ERR(trng->clk);

ret = clk_enable(trng->clk);
ret = clk_prepare_enable(trng->clk);
if (ret)
return ret;

Expand Down Expand Up @@ -95,7 +95,7 @@ static int atmel_trng_remove(struct platform_device *pdev)
hwrng_unregister(&trng->rng);

writel(TRNG_KEY, trng->base + TRNG_CR);
clk_disable(trng->clk);
clk_disable_unprepare(trng->clk);

return 0;
}
Expand All @@ -105,7 +105,7 @@ static int atmel_trng_suspend(struct device *dev)
{
struct atmel_trng *trng = dev_get_drvdata(dev);

clk_disable(trng->clk);
clk_disable_unprepare(trng->clk);

return 0;
}
Expand All @@ -114,7 +114,7 @@ static int atmel_trng_resume(struct device *dev)
{
struct atmel_trng *trng = dev_get_drvdata(dev);

return clk_enable(trng->clk);
return clk_prepare_enable(trng->clk);
}

static const struct dev_pm_ops atmel_trng_pm_ops = {
Expand Down

0 comments on commit 21961ef

Please sign in to comment.