Skip to content

Commit f42ae4c

Browse files
committed
Merge tag 'arm-soc/for-5.7/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-based SoCs Device Tree fixes for 5.7, please pull the following: - Nicolas provides a fix for 55c7c06 ("ARM: dts: bcm283x: Fix vc4's firmware bus DMA limitations") which missed adding proper #address-cells and #size-cells properties and he also disables the DSI node which should have been disabled by default but was not. * tag 'arm-soc/for-5.7/devicetree-fixes' of https://github.com/Broadcom/stblinux: ARM: dts: bcm283x: Disable dsi0 node ARM: dts: bcm283x: Add cells encoding format to firmware bus Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents e980121 + 90444b9 commit f42ae4c

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

arch/arm/boot/dts/bcm2835-rpi.dtsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
soc {
1515
firmware: firmware {
1616
compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
17+
#address-cells = <1>;
18+
#size-cells = <1>;
19+
1720
mboxes = <&mailbox>;
1821
dma-ranges;
1922
};

arch/arm/boot/dts/bcm283x.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@
372372
"dsi0_ddr2",
373373
"dsi0_ddr";
374374

375+
status = "disabled";
375376
};
376377

377378
aux: aux@7e215000 {

0 commit comments

Comments
 (0)