hwrng: omap - Add support for 128-bit output of data

So far, this driver only supports up to 64 bits of output data generated
by an RNG. Some IP blocks, like the SafeXcel IP-76 supports up to 128
bits of output data. This commits renames registers descriptions
OUTPUT_L_REG and OUTPUT_H_REG to OUTPUT_0_REG and OUPUT_1_REG,
respectively. It also adds two new values to the enumeration of existing
registers: OUTPUT_2_REG and OUTPUT_3_REG.

Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index e4f71c8147f9be7731c6bdb99408a521163f06d5..6c18540c8b43a3ea596978616ae257ad931cb32b 100644 (file)
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -65,8 +65,10 @@
 #define OMAP4_RNG_OUTPUT_SIZE                  0x8
 
 enum {
-       RNG_OUTPUT_L_REG = 0,
-       RNG_OUTPUT_H_REG,
+       RNG_OUTPUT_0_REG = 0,
+       RNG_OUTPUT_1_REG,
+       RNG_OUTPUT_2_REG,
+       RNG_OUTPUT_3_REG,
        RNG_STATUS_REG,
        RNG_INTMASK_REG,
        RNG_INTACK_REG,
@@ -82,7 +84,7 @@ enum {
 };
 
 static const u16 reg_map_omap2[] = {
-       [RNG_OUTPUT_L_REG]      = 0x0,
+       [RNG_OUTPUT_0_REG]      = 0x0,
        [RNG_STATUS_REG]        = 0x4,
        [RNG_CONFIG_REG]        = 0x28,
        [RNG_REV_REG]           = 0x3c,
@@ -90,8 +92,8 @@ static const u16 reg_map_omap2[] = {
 };
 
 static const u16 reg_map_omap4[] = {
-       [RNG_OUTPUT_L_REG]      = 0x0,
-       [RNG_OUTPUT_H_REG]      = 0x4,
+       [RNG_OUTPUT_0_REG]      = 0x0,
+       [RNG_OUTPUT_1_REG]      = 0x4,
        [RNG_STATUS_REG]        = 0x8,
        [RNG_INTMASK_REG]       = 0xc,
        [RNG_INTACK_REG]        = 0x10,
@@ -163,7 +165,7 @@ static int omap_rng_do_read(struct hwrng *rng, void *data, size_t max,
        if (!present)
                return 0;
 
-       memcpy_fromio(data, priv->base + priv->pdata->regs[RNG_OUTPUT_L_REG],
+       memcpy_fromio(data, priv->base + priv->pdata->regs[RNG_OUTPUT_0_REG],
                      priv->pdata->data_size);
 
        if (priv->pdata->regs[RNG_INTACK_REG])