Commit b9dbe010 authored by Matthew Hagan's avatar Matthew Hagan Committed by Florian Fainelli
Browse files

ARM: dts: NSP: Disable PL330 by default, add dma-coherent property 



Currently the PL330 is enabled by default. However if left in IDM reset, as is
the case with the Meraki and Synology NSP devices, the system will hang when
probing for the PL330's AMBA peripheral ID. We therefore should be able to
disable it in these cases.

The PL330 is also included among of the list of peripherals put into coherent
mode, so "dma-coherent" has been added here as well.

Fixes: 5fa1026a ("ARM: dts: NSP: Add PL330 support")
Signed-off-by: default avatarMatthew Hagan <mnhagan88@gmail.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent de1f6d93

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

+3 −1
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 {

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

};

arch/arm/boot/dts/bcm958622hr.dts

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


/* USB 3 and SLIC support needed to be complete */



&dma {

	status = "okay";

};



&amac0 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE