Re: [PATCH v2 3/3] ARM: dts: bcm2711: Enable HWRNG support

Stefan Wahren
2019-11-19T17:00:33Z

Hi Stephen,

Am 19.11.19 um 12:15 schrieb Matthias Brugger:
>
> On 19/11/2019 11:07, Nicolas Saenz Julienne wrote:
>> Hi Stephen, thanks for the follow-up.
>>
>> On Mon, 2019-11-18 at 22:14 -0800, 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.
>>>
>>> Signed-off-by: Stephen Brennan <stephen@brennan.io>
>>> ---
>> It's petty in this case but you should add a list of changes here too.
>>
>>> 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>;
please take into account that according to the rng200 binding document
there is no interrupt or clock. So drop it.
>>> -
>>> - /* 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>;
>>> + };
>>> + };
>>> +};
>> I think Stefan wrote bcm283x-common.dtsi by mistake, he really meant
>> bcm2835-common.dtsi.

Correct. Sorry for the confusion.

Regards
Stefan

>>
> Thanks I was just wondering on which tree/patch-set this was based.
>
> Regards,
> Matthias
>
>> See bcm2835-common.dtsi's header comment:
>>
>> /* This include file covers the common peripherals and configuration between
>> * bcm2835, bcm2836 and bcm2837 implementations.
>> */
>>
>> Regards,
>> Nicolas
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel