summaryrefslogtreecommitdiff
path: root/arch/arm64/boot/dts/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-03-13 04:43:08 +0300
committerOlof Johansson <olof@lixom.net>2016-03-13 04:43:08 +0300
commit8061a17ee3fb3e183873c8be3cfaaa37c41ce679 (patch)
treed49e6b987465e0da2fa67b42a73e5c2bf619108e /arch/arm64/boot/dts/Makefile
parentc8c904471a501fb970de7c3a9a9c66483dbcdb55 (diff)
parentcc733bc90636118b20aad8ce7421001b679b338a (diff)
downloadlinux-8061a17ee3fb3e183873c8be3cfaaa37c41ce679.tar.xz
Merge tag 'for-v4.6/gxbb-dt' of https://github.com/carlocaione/linux-meson into next/dt64
This series adds initial support for the Amlogic S905 based Tronsmart Vega S95 Pro, Meta and Telos TV boxes. - Add new DTS to enable support for the boards - Add documentation for compatibles and vendor prefix * tag 'for-v4.6/gxbb-dt' of https://github.com/carlocaione/linux-meson: ARM64: dts: amlogic: Add Tronsmart Vega S95 configs Documentation: devicetree: amlogic: Document Tronsmart Vega S95 boards ARM64: dts: Prepare configs for Amlogic Meson GXBaby Documentation: devicetree: amlogic: Document Meson GXBaby devicetree: bindings: Add vendor prefix for Tronsmart Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/Makefile')
-rw-r--r--arch/arm64/boot/dts/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index fd80617a9c6f..330fae966cf3 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -1,6 +1,7 @@
dts-dirs += al
dts-dirs += altera
dts-dirs += amd
+dts-dirs += amlogic
dts-dirs += apm
dts-dirs += arm
dts-dirs += broadcom