mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 13:29:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'tags/bcm2835-dt-next-2020-01-07' into devicetree/next

Browse Source 
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli
2020-01-08 10:09:49 -08:00
parent 030cc6cb1b 530735df62
commit 0100f76d96
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/bcm2711.dtsi
View File

@@ -112,10 +112,8 @@ pm: watchdog@7e100000 {
};
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 {

6
arch/arm/boot/dts/bcm2835-common.dtsi
View File

@@ -70,6 +70,12 @@ pm: watchdog@7e100000 {
system-power-controller;
};
rng@7e104000 {
compatible = "brcm,bcm2835-rng";
reg = <0x7e104000 0x10>;
interrupts = <2 29>;
};
pixelvalve@7e206000 {
compatible = "brcm,bcm2835-pixelvalve0";
reg = <0x7e206000 0x100>;

6
arch/arm/boot/dts/bcm283x.dtsi
View File

@@ -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>;