diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2020-01-08 10:09:49 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2020-01-08 10:09:49 -0800 |
| commit | 0100f76d96346b44e7310a5cfb102124b6667643 (patch) | |
| tree | b18516a11e00cebcf6b230753c4c4c4997569a85 | |
| parent | 030cc6cb1b6ccc09b74a7957958559dee00ec038 (diff) | |
| parent | 530735df62582d5d1f41faf0e0d1ca7d21dca571 (diff) | |
Merge tag 'tags/bcm2835-dt-next-2020-01-07' into devicetree/next
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
| -rw-r--r-- | arch/arm/boot/dts/bcm2711.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-common.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 961bed832755..ccf917de5e1a 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -112,10 +112,8 @@ }; rng@7e104000 { - interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; - - /* RNG is incompatible with brcm,bcm2835-rng */ - status = "disabled"; + compatible = "brcm,bcm2711-rng200"; + reg = <0x7e104000 0x28>; }; uart2: serial@7e201400 { 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 @@ 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 @@ <&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>; |