From: Olof Johansson Date: Sun, 13 Mar 2016 01:43:08 +0000 (-0800) Subject: Merge tag 'for-v4.6/gxbb-dt' of https://github.com/carlocaione/linux-meson into next... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8061a17ee3fb3e183873c8be3cfaaa37c41ce679;p=linux-beck.git 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 --- 8061a17ee3fb3e183873c8be3cfaaa37c41ce679 diff --cc arch/arm64/boot/dts/Makefile index fd80617a9c6f,0ca53c2fbe5d..330fae966cf3 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@@ -1,6 -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