Skip to content

Commit

Permalink
dt-bindings: rng: Incorporate brcm,bcm6368.txt binding
Browse files Browse the repository at this point in the history
Since the same block is used on BCM2835 and BCM6368, merge the bindings
and remove the brcm,bcm6368.txt binding document.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Florian Fainelli authored and Herbert Xu committed Nov 29, 2017
1 parent 6f09359 commit 67fe2fa
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
22 changes: 19 additions & 3 deletions Documentation/devicetree/bindings/rng/brcm,bcm2835.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
BCM2835 Random number generator
BCM2835/6368 Random number generator

Required properties:

- compatible : should be "brcm,bcm2835-rng" or "brcm,bcm-nsp-rng" or
"brcm,bcm5301x-rng"
- compatible : should be one of
"brcm,bcm2835-rng"
"brcm,bcm-nsp-rng"
"brcm,bcm5301x-rng" or
"brcm,bcm6368-rng"
- reg : Specifies base physical address and size of the registers.

Optional properties:

- clocks : phandle to clock-controller plus clock-specifier pair
- clock-names : "ipsec" as a clock name

Example:

rng {
Expand All @@ -17,3 +25,11 @@ rng@18033000 {
compatible = "brcm,bcm-nsp-rng";
reg = <0x18033000 0x14>;
};

random: rng@10004180 {
compatible = "brcm,bcm6368-rng";
reg = <0x10004180 0x14>;

clocks = <&periph_clk 18>;
clock-names = "ipsec";
};
17 changes: 0 additions & 17 deletions Documentation/devicetree/bindings/rng/brcm,bcm6368.txt

This file was deleted.

0 comments on commit 67fe2fa

Please sign in to comment.