diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-04-23 18:12:48 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-04-23 18:12:48 +0300 |
| commit | f42ae4cd4cae92408bffec2c0a4c110447e908e0 (patch) | |
| tree | 472a0eb1c9159169b35dd3230c2810928eadf85a | |
| parent | e9801213465aa8b200da98372078d9c4c2bd925a (diff) | |
| parent | 90444b958461a5f8fc299ece0fe17eab15cba1e1 (diff) | |
| download | linux-f42ae4cd4cae92408bffec2c0a4c110447e908e0.tar.xz | |
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 55c7c0621078 ("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/20200417171725.1084-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index fd2c766e0f71..f7ae5a4530b8 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -14,6 +14,9 @@ soc { firmware: firmware { compatible = "raspberrypi,bcm2835-firmware", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + mboxes = <&mailbox>; dma-ranges; }; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index e1abe8c730ce..b83a864e2e8b 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -372,6 +372,7 @@ "dsi0_ddr2", "dsi0_ddr"; + status = "disabled"; }; aux: aux@7e215000 { |