summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-10-22 19:43:03 +0200
committerOlof Johansson <olof@lixom.net>2015-10-22 19:43:03 +0200
commit2995f0a1b607c12ff70581f9b76af02562928f99 (patch)
tree4022d17be8ca7412f32c8ca2d77e1dc8ae1e6e66 /arch/arm/boot/dts/Makefile
parentMerge tag 'socfpga_for_v4.4_cleanup' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentARM: mvebu: set SW polling as SDHCI card detection on A388-GP (diff)
downloadlinux-2995f0a1b607c12ff70581f9b76af02562928f99.tar.xz
linux-2995f0a1b607c12ff70581f9b76af02562928f99.zip
Merge tag 'mvebu-dt-4.4-2' of git://git.infradead.org/linux-mvebu into next/dt
mvebu dt for 4.4 (part 2) - Add support for severals Armada-370-based Seagate NAS - Fix Ready NAS device tree - Modify SDHCI binding for A388-GP allowing using it on old and new version of the board * tag 'mvebu-dt-4.4-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: set SW polling as SDHCI card detection on A388-GP arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 ARM: mvebu: add DT support for Seagate Personal Cloud ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ad3ac4afb183..b2ab89151796 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -723,6 +723,10 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
armada-370-netgear-rn102.dtb \
armada-370-netgear-rn104.dtb \
armada-370-rd.dtb \
+ armada-370-seagate-nas-2bay.dtb \
+ armada-370-seagate-nas-4bay.dtb \
+ armada-370-seagate-personal-cloud.dtb \
+ armada-370-seagate-personal-cloud-2bay.dtb \
armada-370-synology-ds213j.dtb
dtb-$(CONFIG_MACH_ARMADA_375) += \
armada-375-db.dtb