commit 5dff78f5a96918923948685c8d0eb0ec3cc506fc Author: José Vázquez Fernández Date: Mon Sep 14 22:56:52 2015 +0200 JZ47XX rng driver diff --git a/Documentation/devicetree/bindings/rng/ingenic,jz47xx.txt b/Documentation/devicetree/bindings/rng/ingenic,jz47xx.txt new file mode 100644 index 0000000..3deabb0 --- /dev/null +++ b/Documentation/devicetree/bindings/rng/ingenic,jz47xx.txt @@ -0,0 +1,12 @@ +JZ47XX Random number generator + +Required properties: +- compatible : should be "ingenic,jz47xx-rng" +- reg : Specifies base physical address and size of the registers. + +Example: + +rng: rng@10000000 { + compatible = "ingenic,jz47xx-rng"; + reg = <0x10000000 0x10>; +}; diff --git a/arch/mips/boot/dts/jz4780.dtsi b/arch/mips/boot/dts/jz4780.dtsi index d1e5e5c..9a0c54b 100644 --- a/arch/mips/boot/dts/jz4780.dtsi +++ b/arch/mips/boot/dts/jz4780.dtsi @@ -60,6 +60,13 @@ #clock-cells = <1>; }; + /* I have no idea if this is correct and/or + * if this is the right place. */ + rng: rng@10000000 { + compatible = "ingenic,jz47xx-rng"; + reg = <0x10000000 0x10>; + }; + gpu: jz4780-sgx@13040000 { compatible = "ingenic,jz4780-sgx"; reg = <0x13040000 0x4000>; diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 91a04ae..e285617 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -114,6 +114,20 @@ config HW_RANDOM_GEODE If unsure, say Y. +config HW_RANDOM_JZ47XX + tristate "Ingenic JZ47XX Random Number Generator support" + depends on MIPS + default HW_RANDOM + ---help--- + This driver provides kernel-side support for the Random Number + Generator hardware found on some Ingenic SoCs. + + To compile this driver as a module, choose M here: the + module will be called jz47xx-rng + + If unsure, say Y. +# Can be put "It is safe to say Y." instead "If unsure, say Y."? + config HW_RANDOM_N2RNG tristate "Niagara2 Random Number Generator support" depends on SPARC64 diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile index 0b4cd57..d233d29 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_HW_RANDOM_AMD) += amd-rng.o obj-$(CONFIG_HW_RANDOM_ATMEL) += atmel-rng.o obj-$(CONFIG_HW_RANDOM_BCM63XX) += bcm63xx-rng.o obj-$(CONFIG_HW_RANDOM_GEODE) += geode-rng.o +obj-$(CONFIG_HW_RANDOM_JZ47XX) += jz47xx-rng.o obj-$(CONFIG_HW_RANDOM_N2RNG) += n2-rng.o n2-rng-y := n2-drv.o n2-asm.o obj-$(CONFIG_HW_RANDOM_VIA) += via-rng.o diff --git a/drivers/char/hw_random/jz47xx-rng.c b/drivers/char/hw_random/jz47xx-rng.c new file mode 100644 index 0000000..9bb8c8b --- /dev/null +++ b/drivers/char/hw_random/jz47xx-rng.c @@ -0,0 +1,127 @@ +/* + * Random Number Generator driver for Ingenic SoCs + * + * Copyright 2015 (c) José Vázquez Fernández + * Copyright 2015 (c) James Hogan + * + * with the majority of the code coming from: + * + * Broadcom BCM2835 Random Number Generator support + * + * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2013 Lubomir Rintel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License ("GPL") + * version 2, as published by the Free Software Foundation. + */ + +// Are all these headers needed? +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define RNG_REG_CTRL 0xd8 +#define RNG_REG_DATA 0xdc + +static int jz47xx_rng_read(struct hwrng *rng, u32 *data) +{ + void __iomem *rng_base = (void __iomem *)rng->priv; + + *data = readl(rng_base + RNG_REG_DATA); +} + +/** + * RNG_REG_DATA is a r/w register + * For now we will left this function unless it is + * totally useless. + */ +static int void jz47xx_rng_write(struct hwrng *rng, u32 val) +{ + void __iomem *rng_base = (void __iomem *)rng->priv; + + writel(val, rng_base + RNG_REG_DATA); +} + +static struct hwrng jz47xx_rng_ops = { + .name = "jz47xx", + .read = jz47xx_rng_read, +}; + +static int jz47xx_rng_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; // Is it needed? + struct resource *res; + void __iomem *rng_base; + int err; + + /* map peripheral */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + rng_base = devm_ioremap_resource(dev, res); + if (IS_ERR(rng_base)) + return PTR_ERR(rng_base); + if (!rng_base) { + dev_err(dev, "failed to remap JZ47XX rng regs"); + return -ENOMEM; + } + + jz47xx_rng_ops.priv = (unsigned long)rng_base; + + /* enable hwrng */ + writel(1, rng_base + RNG_REG_CTRL); + + /* register driver */ + err = hwrng_register(&jz47xx_rng_ops); + if (err) { + dev_err(dev, "JZ47XX hwrng registration failed\n"); + /* disable rng hardware */ + writel(0, rng_base + RNG_REG_CTRL); //maybe this line is useless + } else { + dev_info(dev, "JZ47XX hwrng registered\n"); + + } + return err; +} + +static int jz47xx_rng_remove(struct platform_device *pdev) +{ + void __iomem *rng_base = (void __iomem *)jz47xx_rng_ops.priv; + + /* disable rng hardware */ + writel(0, rng_base + RNG_CTRL); + + /* unregister driver */ + hwrng_unregister(&jz47xx_rng_ops);; + dev_info(dev, "JZ47XX hwrng unregistered\n"); + + return 0; +} + +static const struct of_device_id jz47xx_rng_of_match[] = { + { .compatible = "ingenic,jz47xx-rng", }, + {}, +}; +MODULE_DEVICE_TABLE(of, jz47xx_rng_of_match); + +static struct platform_driver jz47xx_rng_driver = { + .driver = { + .name = "jz47xx-rng", + .of_match_table = jz47xx_rng_of_match, + }, + .probe = jz47xx_rng_probe, + .remove = jz47xx_rng_remove, +}; +module_platform_driver(jz47xx_rng_driver); + +MODULE_AUTHOR("José Vázquez Fernández "); +MODULE_AUTHOR("James Hogan"); +MODULE_DESCRIPTION("jz47xx Random Number Generator (RNG) driver"); +MODULE_ALIAS("platform:jz47xx-rng"); +MODULE_LICENSE("GPL v2");