Skip to content

Commit

Permalink
hwrng: timeriomem - added devicetree hooks
Browse files Browse the repository at this point in the history
This patch allows timeriomem_rng to be used via devicetree.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Alexander Clouter authored and Herbert Xu committed Apr 25, 2013
1 parent 1907da7 commit b149a30
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 2 deletions.
18 changes: 18 additions & 0 deletions Documentation/devicetree/bindings/hwrng/timeriomem_rng.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
HWRNG support for the timeriomem_rng driver

Required properties:
- compatible : "timeriomem_rng"
- reg : base address to sample from
- period : wait time in microseconds to use between samples

N.B. currently 'reg' must be four bytes wide and aligned

Example:

hwrng@44 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "timeriomem_rng";
reg = <0x44 0x04>;
period = <1000000>;
};
24 changes: 22 additions & 2 deletions drivers/char/hw_random/timeriomem-rng.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/of.h>
#include <linux/hw_random.h>
#include <linux/io.h>
#include <linux/slab.h>
Expand Down Expand Up @@ -101,7 +102,7 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
int err = 0;
int period;

if (!pdata) {
if (!pdev->dev.of_node && !pdata) {
dev_err(&pdev->dev, "timeriomem_rng_data is missing\n");
return -EINVAL;
}
Expand All @@ -125,7 +126,19 @@ static int timeriomem_rng_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, priv);

period = pdata->period;
if (pdev->dev.of_node) {
int i;

if (!of_property_read_u32(pdev->dev.of_node,
"period", &i))
period = i;
else {
dev_err(&pdev->dev, "missing period\n");
err = -EINVAL;
goto out_free;
}
} else
period = pdata->period;

priv->period = usecs_to_jiffies(period);
if (priv->period < 1) {
Expand Down Expand Up @@ -202,10 +215,17 @@ static int timeriomem_rng_remove(struct platform_device *pdev)
return 0;
}

static const struct of_device_id timeriomem_rng_match[] = {
{ .compatible = "timeriomem_rng" },
{},
};
MODULE_DEVICE_TABLE(of, timeriomem_rng_match);

static struct platform_driver timeriomem_rng_driver = {
.driver = {
.name = "timeriomem_rng",
.owner = THIS_MODULE,
.of_match_table = timeriomem_rng_match,
},
.probe = timeriomem_rng_probe,
.remove = timeriomem_rng_remove,
Expand Down

0 comments on commit b149a30

Please sign in to comment.