summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/bcm958625k.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-06-28 14:47:24 +0200
committerArnd Bergmann <arnd@arndb.de>2020-06-28 14:47:24 +0200
commit275087fc3ef5af5d20b5cab1403bd29d12311c6a (patch)
tree3f9dfdff312702a2d03096f31d0bfe3c2cd9b773 /arch/arm/boot/dts/bcm958625k.dts
parent0f77ce26ebcf6ea384421d2dd47b924b83649692 (diff)
parentac4e106d8934a5894811fc263f4b03fc8ed0fb7a (diff)
downloadlinux-275087fc3ef5af5d20b5cab1403bd29d12311c6a.tar.bz2
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/bcm958625k.dts')
-rw-r--r--arch/arm/boot/dts/bcm958625k.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
index 3fcca12d83c2..7b84b54436ed 100644
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -48,6 +48,10 @@
};
};
+&dma {
+ status = "okay";
+};
+
&amac0 {
status = "okay";
};