diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 15:08:17 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 15:08:17 +0100 |
commit | 54fe90874fd37caeb8914a1dee511920fa799c08 (patch) | |
tree | faec81b678e070481720f178b558960cc4e075cf /arch/arm/boot/dts/Makefile | |
parent | 387720c93812f1e702c20c667cb003a356e24a6c (diff) | |
parent | 5cb13094484ba89d9a2623ddb72b36ea498e2bff (diff) |
Merge tag 'mvebu-dt-4.11-3' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt for 4.11 (part 3)" from Gregory CLEMENT:
Add support for Marvell switches with integrated CPUs based on Armada XP
* tag 'mvebu-dt-4.11-3' of git://git.infradead.org/linux-mvebu:
ARM: dts: mvebu: Add device tree for db-dxbc2 and db-xc3-24g4xg boards
ARM: dts: mvebu: Add device tree for 98DX3236 SoCs
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 7c743c53f3ff..d064854d6378 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -976,6 +976,8 @@ dtb-$(CONFIG_MACH_ARMADA_39X) += \ dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-axpwifiap.dtb \ armada-xp-db.dtb \ + armada-xp-db-dxbc2.dtb \ + armada-xp-db-xc3-24g4xg.dtb \ armada-xp-gp.dtb \ armada-xp-lenovo-ix4-300d.dtb \ armada-xp-linksys-mamba.dtb \ |