| Message ID | 1424138956-11563-3-git-send-email-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
Hello. On 2/17/2015 5:09 AM, Florian Fainelli wrote: > arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h contains the register > definitions for this random number generator block, incorporate these > register definitions directly into the bcm63xx-rng driver so we do not > rely on this header to be provided. > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > --- > drivers/char/hw_random/bcm63xx-rng.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c > index ed9b28b35a39..c7f3af852599 100644 > --- a/drivers/char/hw_random/bcm63xx-rng.c > +++ b/drivers/char/hw_random/bcm63xx-rng.c > @@ -13,7 +13,15 @@ > #include <linux/platform_device.h> > #include <linux/hw_random.h> > > -#include <bcm63xx_regs.h> > +#define RNG_CTRL 0x00 > +#define RNG_EN (1 << 0) > + > +#define RNG_STAT 0x04 > +#define RNG_AVAIL_MASK (0xff000000) Parens not needed here. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c index ed9b28b35a39..c7f3af852599 100644 --- a/drivers/char/hw_random/bcm63xx-rng.c +++ b/drivers/char/hw_random/bcm63xx-rng.c @@ -13,7 +13,15 @@ #include <linux/platform_device.h> #include <linux/hw_random.h> -#include <bcm63xx_regs.h> +#define RNG_CTRL 0x00 +#define RNG_EN (1 << 0) + +#define RNG_STAT 0x04 +#define RNG_AVAIL_MASK (0xff000000) + +#define RNG_DATA 0x08 +#define RNG_THRES 0x0c +#define RNG_MASK 0x10 struct bcm63xx_rng_priv { struct clk *clk;
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h contains the register definitions for this random number generator block, incorporate these register definitions directly into the bcm63xx-rng driver so we do not rely on this header to be provided. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/char/hw_random/bcm63xx-rng.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)