Commit 61f291db authored by Matthew Hagan's avatar Matthew Hagan Committed by Sasha Levin
Browse files

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

[ Upstream commit b9dbe010 ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 752d7e8b
......@@ -200,7 +200,7 @@ uart1: serial@400 {
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 @@ dma@20000 {
clocks = <&iprocslow>;
clock-names = "apb_pclk";
#dma-cells = <1>;
dma-coherent;
status = "disabled";
};
sdio: sdhci@21000 {
......
......@@ -58,6 +58,10 @@ gpio-restart {
/* USB 3 support needed to be complete */
&dma {
status = "okay";
};
&amac0 {
status = "okay";
};
......
......@@ -58,6 +58,10 @@ gpio-restart {
/* USB 3 support needed to be complete */
&dma {
status = "okay";
};
&amac0 {
status = "okay";
};
......
......@@ -58,6 +58,10 @@ gpio-restart {
/* XHCI support needed to be complete */
&dma {
status = "okay";
};
&amac0 {
status = "okay";
};
......
......@@ -58,6 +58,10 @@ gpio-restart {
/* USB 3 and SLIC support needed to be complete */
&dma {
status = "okay";
};
&amac0 {
status = "okay";
};
......
......@@ -58,6 +58,10 @@ gpio-restart {
/* USB 3 and SLIC support needed to be complete */
&dma {
status = "okay";
};
&amac0 {
status = "okay";
};
......
......@@ -69,6 +69,10 @@ &i2c0 {
status = "okay";
};
&dma {
status = "okay";
};
&amac0 {
status = "okay";
};
......
......@@ -48,6 +48,10 @@ memory@60000000 {
};
};
&dma {
status = "okay";
};
&amac0 {
status = "okay";
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment