diff options
author | Benoît Thébaudeau <benoit.thebaudeau@advansee.com> | 2012-06-13 12:15:34 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-06-27 02:42:00 -0400 |
commit | 3621189064301a5fbb5d06ca17d966a026f4e501 (patch) | |
tree | 6a53dfd095471cb4c776261de4f33d664c5a7254 /drivers/char/hw_random | |
parent | 398710379f516012c52d2ae396a9ba919bd6a7ab (diff) |
hwrng: mxc-rnga - fix data_present API
Commit 45001e9, which added support for RNGA, ignored the previous commit
984e976, which changed the data_present API.
Cc: Matt Mackall <mpm@selenic.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Alan Carvalho de Assis <acassis@gmail.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/char/hw_random')
-rw-r--r-- | drivers/char/hw_random/mxc-rnga.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/drivers/char/hw_random/mxc-rnga.c b/drivers/char/hw_random/mxc-rnga.c index 187c6be80f43..85074de5042e 100644 --- a/drivers/char/hw_random/mxc-rnga.c +++ b/drivers/char/hw_random/mxc-rnga.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/ioport.h> | 24 | #include <linux/ioport.h> |
25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
26 | #include <linux/hw_random.h> | 26 | #include <linux/hw_random.h> |
27 | #include <linux/delay.h> | ||
27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
28 | 29 | ||
29 | /* RNGA Registers */ | 30 | /* RNGA Registers */ |
@@ -60,16 +61,20 @@ | |||
60 | 61 | ||
61 | static struct platform_device *rng_dev; | 62 | static struct platform_device *rng_dev; |
62 | 63 | ||
63 | static int mxc_rnga_data_present(struct hwrng *rng) | 64 | static int mxc_rnga_data_present(struct hwrng *rng, int wait) |
64 | { | 65 | { |
65 | int level; | ||
66 | void __iomem *rng_base = (void __iomem *)rng->priv; | 66 | void __iomem *rng_base = (void __iomem *)rng->priv; |
67 | 67 | int i; | |
68 | /* how many random numbers is in FIFO? [0-16] */ | 68 | |
69 | level = ((__raw_readl(rng_base + RNGA_STATUS) & | 69 | for (i = 0; i < 20; i++) { |
70 | RNGA_STATUS_LEVEL_MASK) >> 8); | 70 | /* how many random numbers are in FIFO? [0-16] */ |
71 | 71 | int level = (__raw_readl(rng_base + RNGA_STATUS) & | |
72 | return level > 0 ? 1 : 0; | 72 | RNGA_STATUS_LEVEL_MASK) >> 8; |
73 | if (level || !wait) | ||
74 | return !!level; | ||
75 | udelay(10); | ||
76 | } | ||
77 | return 0; | ||
73 | } | 78 | } |
74 | 79 | ||
75 | static int mxc_rnga_data_read(struct hwrng *rng, u32 * data) | 80 | static int mxc_rnga_data_read(struct hwrng *rng, u32 * data) |