mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
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: 5fa1026a3e
("ARM: dts: NSP: Add PL330 support")
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
parent
de1f6d9304
commit
b9dbe0101e
8 changed files with 31 additions and 1 deletions
|
@ -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";
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue