diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-06-28 15:47:24 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-06-28 15:47:24 +0300 |
| commit | 275087fc3ef5af5d20b5cab1403bd29d12311c6a (patch) | |
| tree | 3f9dfdff312702a2d03096f31d0bfe3c2cd9b773 /arch/arm/boot/dts/bcm958623hr.dts | |
| parent | 0f77ce26ebcf6ea384421d2dd47b924b83649692 (diff) | |
| parent | ac4e106d8934a5894811fc263f4b03fc8ed0fb7a (diff) | |
| download | linux-275087fc3ef5af5d20b5cab1403bd29d12311c6a.tar.xz | |
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/bcm958623hr.dts')
| -rw-r--r-- | arch/arm/boot/dts/bcm958623hr.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts index b2c7f21d471e..dd6dff6452b8 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts @@ -58,6 +58,10 @@ /* USB 3 and SLIC support needed to be complete */ +&dma { + status = "okay"; +}; + &amac0 { status = "okay"; }; |