Commit f42ae4cd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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 55c7c062 ("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: default avatarArnd Bergmann <arnd@arndb.de>
parents e9801213 90444b95

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

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
	soc {

		firmware: firmware {

			compatible = "raspberrypi,bcm2835-firmware", "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;



			mboxes = <&mailbox>;

			dma-ranges;

		};

arch/arm/boot/dts/bcm283x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ 
					     "dsi0_ddr2",

					     "dsi0_ddr";



			status = "disabled";

		};



		aux: aux@7e215000 {