Hi Matthias,
On Tue Nov 19, 2019 at 12:14 PM, Matthias Brugger wrote:
>
>
>
>
> On 19/11/2019 07:14, Stephen Brennan wrote:
> > BCM2711 features a RNG200 hardware random number generator block, which is
> > different from the BCM283x from which it inherits. Move the rng block from
> > BCM283x into a separate common file, and update the rng declaration of
> > BCM2711.
> >
>
>
> I'd prefer to split this in two patches. One moving the node and another
> one
> adding the new node for bcm2711.
>
Makes sense, I thought about doing it initially but didn't do it. In the
patch moving the node, should the bcm2711 continue to inherit the moved rng
node from its new location?
Thanks,
Stephen
>
> Regards,
> Matthias
>
>
> > Signed-off-by: Stephen Brennan <stephen@xxxxxxxxxx>
> > ---
> > arch/arm/boot/dts/bcm2711.dtsi | 6 +++---
> > arch/arm/boot/dts/bcm2835.dtsi | 1 +
> > arch/arm/boot/dts/bcm2836.dtsi | 1 +
> > arch/arm/boot/dts/bcm2837.dtsi | 1 +
> > arch/arm/boot/dts/bcm283x-common.dtsi | 11 +++++++++++
> > arch/arm/boot/dts/bcm283x.dtsi | 6 ------
> > 6 files changed, 17 insertions(+), 9 deletions(-)
> > create mode 100644 arch/arm/boot/dts/bcm283x-common.dtsi
> >
> > diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
> > index ac83dac2e6ba..4975567e948e 100644
> > --- a/arch/arm/boot/dts/bcm2711.dtsi
> > +++ b/arch/arm/boot/dts/bcm2711.dtsi
> > @@ -92,10 +92,10 @@ pm: watchdog@7e100000 {
> > };
> >
> > rng@7e104000 {
> > + compatible = "brcm,bcm2711-rng200";
> > + reg = <0x7e104000 0x28>;
> > interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
> > -
> > - /* RNG is incompatible with brcm,bcm2835-rng */
> > - status = "disabled";
> > + status = "okay";
> > };
> >
> > uart2: serial@7e201400 {
> > diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
> > index 53bf4579cc22..f7b2f46e307d 100644
> > --- a/arch/arm/boot/dts/bcm2835.dtsi
> > +++ b/arch/arm/boot/dts/bcm2835.dtsi
> > @@ -1,5 +1,6 @@
> > // SPDX-License-Identifier: GPL-2.0
> > #include "bcm283x.dtsi"
> > +#include "bcm283x-common.dtsi"
> > #include "bcm2835-common.dtsi"
> >
> > / {
> > diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi
> > index 82d6c4662ae4..a85374195796 100644
> > --- a/arch/arm/boot/dts/bcm2836.dtsi
> > +++ b/arch/arm/boot/dts/bcm2836.dtsi
> > @@ -1,5 +1,6 @@
> > // SPDX-License-Identifier: GPL-2.0
> > #include "bcm283x.dtsi"
> > +#include "bcm283x-common.dtsi"
> > #include "bcm2835-common.dtsi"
> >
> > / {
> > diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
> > index 9e95fee78e19..045d78ffea08 100644
> > --- a/arch/arm/boot/dts/bcm2837.dtsi
> > +++ b/arch/arm/boot/dts/bcm2837.dtsi
> > @@ -1,4 +1,5 @@
> > #include "bcm283x.dtsi"
> > +#include "bcm283x-common.dtsi"
> > #include "bcm2835-common.dtsi"
> >
> > / {
> > diff --git a/arch/arm/boot/dts/bcm283x-common.dtsi b/arch/arm/boot/dts/bcm283x-common.dtsi
> > new file mode 100644
> > index 000000000000..3c8834bee390
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/bcm283x-common.dtsi
> > @@ -0,0 +1,11 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +
> > +/ {
> > + soc {
> > + rng@7e104000 {
> > + compatible = "brcm,bcm2835-rng";
> > + reg = <0x7e104000 0x10>;
> > + interrupts = <2 29>;
> > + };
> > + };
> > +};
> > 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>;
> >
>
>
>
>
