| Message ID | 20191120031622.88949-4-stephen@brennan.io (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Raspberry Pi 4 HWRNG Support | expand |
Am 20.11.19 um 04:16 schrieb Stephen Brennan: > BCM2711 inherits from BCM283X, but has an incompatible HWRNG. Move this > node to bcm2835-common.dtsi, so that BCM2711 can define its own. > > Signed-off-by: Stephen Brennan <stephen@brennan.io> Acked-by: Stefan Wahren <wahrenst@gmx.net>
diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi index fe1ab40c7f22..2b1d9d4c0cde 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -70,6 +70,12 @@ pm: watchdog@7e100000 { system-power-controller; }; + rng@7e104000 { + compatible = "brcm,bcm2835-rng"; + reg = <0x7e104000 0x10>; + interrupts = <2 29>; + }; + pixelvalve@7e206000 { compatible = "brcm,bcm2835-pixelvalve0"; reg = <0x7e206000 0x100>; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 3caaa57eb6c8..5219339fc27c 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -84,12 +84,6 @@ clocks: cprman@7e101000 { <&dsi1 0>, <&dsi1 1>, <&dsi1 2>; }; - rng@7e104000 { - compatible = "brcm,bcm2835-rng"; - reg = <0x7e104000 0x10>; - interrupts = <2 29>; - }; - mailbox: mailbox@7e00b880 { compatible = "brcm,bcm2835-mbox"; reg = <0x7e00b880 0x40>;
BCM2711 inherits from BCM283X, but has an incompatible HWRNG. Move this node to bcm2835-common.dtsi, so that BCM2711 can define its own. Signed-off-by: Stephen Brennan <stephen@brennan.io> --- Changes in v3: - moved the bcm2835 rng into bcm2835-common.dtsi rather than a new file - split out enabling rng on bcm2711 into its own patch arch/arm/boot/dts/bcm2835-common.dtsi | 6 ++++++ arch/arm/boot/dts/bcm283x.dtsi | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)