Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / char / hw_random / nomadik-rng.c

diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
index a8b4c401014483e4fea73ff193f93e4d306049dd..a348c7e9aa0bbb44a360afb0f92806be6cc1560b 100644 (file)
--- a/drivers/char/hw_random/nomadik-rng.c
+++ b/drivers/char/hw_random/nomadik-rng.c
@@ -15,6 +15,10 @@
 #include <linux/amba/bus.h>
 #include <linux/hw_random.h>
 #include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+
+static struct clk *rng_clk;
 
 static int nmk_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
 {
@@ -40,6 +44,15 @@ static int nmk_rng_probe(struct amba_device *dev, struct amba_id *id)
        void __iomem *base;
        int ret;
 
+       rng_clk = clk_get(&dev->dev, NULL);
+       if (IS_ERR(rng_clk)) {
+               dev_err(&dev->dev, "could not get rng clock\n");
+               ret = PTR_ERR(rng_clk);
+               return ret;
+       }
+
+       clk_enable(rng_clk);
+
        ret = amba_request_regions(dev, dev->dev.init_name);
        if (ret)
                return ret;
@@ -57,6 +70,8 @@ out_unmap:
        iounmap(base);
 out_release:
        amba_release_regions(dev);
+       clk_disable(rng_clk);
+       clk_put(rng_clk);
        return ret;
 }
 
@@ -66,6 +81,8 @@ static int nmk_rng_remove(struct amba_device *dev)
        hwrng_unregister(&nmk_rng);
        iounmap(base);
        amba_release_regions(dev);
+       clk_disable(rng_clk);
+       clk_put(rng_clk);
        return 0;
 }