diff options
| author |   Stephen Brennan <stephen@brennan.io> | 2019-11-19 19:16:21 -0800 |
|---|---|---|
| committer |   Nicolas Saenz Julienne <nsaenzjulienne@suse.de> | 2020-01-07 20:11:51 +0100 |
| commit | c4414cac85b623bd43f78174c5acac28a0795f13 (patch) | |
| tree | c288c2fd2683aebd0fc32bfd95d17aa46abab40c | |
| parent | Linux 5.5-rc1 (diff) | |
| download | linux-dev-c4414cac85b623bd43f78174c5acac28a0795f13.tar.xz linux-dev-c4414cac85b623bd43f78174c5acac28a0795f13.zip | |
ARM: dts: bcm2835: Move rng definition to common location
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>
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-common.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 6 |
2 files changed, 6 insertions, 6 deletions
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>; |