From: Matthias Brugger <matthias.bgg@gmail.com>
To: Stephen Brennan <stephen@brennan.io>
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org,
Florian Fainelli <f.fainelli@gmail.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Scott Branden <sbranden@broadcom.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-arm-kernel@lists.infradead.org, Ray Jui <rjui@broadcom.com>,
linux-kernel@vger.kernel.org, Eric Anholt <eric@anholt.net>,
Rob Herring <robh+dt@kernel.org>,
bcm-kernel-feedback-list@broadcom.com,
Stefan Wahren <wahrenst@gmx.net>, Matt Mackall <mpm@selenic.com>,
Arnd Bergmann <arnd@arndb.de>,
linux-crypto@vger.kernel.org
Subject: Re: [PATCH v2 3/3] ARM: dts: bcm2711: Enable HWRNG support
Date: Tue, 19 Nov 2019 12:14:58 +0100 [thread overview]
Message-ID: <ab52b007-b6d7-4e97-9436-eb78365e6e99@gmail.com> (raw)
In-Reply-To: <20191119061407.69911-4-stephen@brennan.io>
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.
Regards,
Matthias
> Signed-off-by: Stephen Brennan <stephen@brennan.io>
> ---
> 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>;
>
next prev parent reply other threads:[~2019-11-19 11:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-19 6:14 [PATCH v2 0/3] Raspberry Pi 4 HWRNG Support Stephen Brennan
2019-11-19 6:14 ` [PATCH v2 1/3] dt-bindings: rng: add BCM2711 RNG compatible Stephen Brennan
2019-11-19 6:14 ` [PATCH v2 2/3] hwrng: iproc-rng200: Add support for BCM2711 Stephen Brennan
2019-11-19 11:16 ` Matthias Brugger
2019-11-19 6:14 ` [PATCH v2 3/3] ARM: dts: bcm2711: Enable HWRNG support Stephen Brennan
2019-11-19 10:07 ` Nicolas Saenz Julienne
2019-11-19 11:15 ` Matthias Brugger
2019-11-19 16:59 ` Stefan Wahren
2019-11-19 17:09 ` Stephen Brennan
2019-11-19 17:25 ` Nicolas Saenz Julienne
2019-11-19 11:14 ` Matthias Brugger [this message]
2019-11-19 17:13 ` Stephen Brennan
2019-12-11 9:33 ` [PATCH v2 0/3] Raspberry Pi 4 HWRNG Support Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ab52b007-b6d7-4e97-9436-eb78365e6e99@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=arnd@arndb.de \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=devicetree@vger.kernel.org \
--cc=eric@anholt.net \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=mpm@selenic.com \
--cc=rjui@broadcom.com \
--cc=robh+dt@kernel.org \
--cc=sbranden@broadcom.com \
--cc=stephen@brennan.io \
--cc=wahrenst@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).