Commit 275087fc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.8/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes 

This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
5.8, please pull the following:

- Rafal adds a missing 'device_type' property to the Luxul XWC-2000
  required for the memory nodes to be correctly parsed by Linux

- Matthew provides two fixes for the NSP SoCs, one to disable the PL330
  DMA controller by default since it can be left in reset by the
  bootloader and the second to correct the flow accelerator mailbox node

* tag 'arm-soc/for-5.8/devicetree-fixes' of https://github.com/Broadcom/stblinux:
  ARM: dts: NSP: Correct FA2 mailbox node
  ARM: dts: NSP: Disable PL330 by default, add dma-coherent property
  ARM: dts: BCM5301X: Add missing memory "device_type" for Luxul XWC-2000

Link: https://lore.kernel.org/r/20200619202250.19029-1-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0f77ce26 ac4e106d

arch/arm/boot/dts/bcm-nsp.dtsi

+6 −4
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ 
			status = "disabled";

		};



		dma@20000 {

		dma: dma@20000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x20000 0x1000>;

			interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
@@ -215,6 +215,8 @@ 
			clocks = <&iprocslow>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			dma-coherent;

			status = "disabled";

		};



		sdio: sdhci@21000 {
@@ -257,10 +259,10 @@ 
			status = "disabled";

		};



		mailbox: mailbox@25000 {

		mailbox: mailbox@25c00 {

			compatible = "brcm,iproc-fa2-mbox";

			reg = <0x25000 0x445>;

			interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;

			reg = <0x25c00 0x400>;

			interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;

			#mbox-cells = <1>;

			brcm,rx-status-len = <32>;

			brcm,use-bcm-hdr;

arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x08000000

		       0x88000000 0x18000000>;

	};

arch/arm/boot/dts/bcm958522er.dts

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ 


/* USB 3 support needed to be complete */



&dma {

	status = "okay";

};



&amac0 {

	status = "okay";

};

arch/arm/boot/dts/bcm958525er.dts

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ 


/* USB 3 support needed to be complete */



&dma {

	status = "okay";

};



&amac0 {

	status = "okay";

};

arch/arm/boot/dts/bcm958525xmc.dts

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ 


/* XHCI support needed to be complete */



&dma {

	status = "okay";

};



&amac0 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE