From: Olof Johansson Date: Wed, 19 Apr 2017 13:33:14 +0000 (-0700) Subject: Merge tag 'zte-dt64-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... X-Git-Tag: v4.12-rc1~52^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b42f45558e77724cb53e8885b26596ffa4f71434;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'zte-dt64-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64 ZTE arm64 device tree updates for 4.12: - Add mmc devices for ZX296718 SoC and enable those available on zx296718-evb board. - Add VOU controller device, output devices HDMI and TVENC, and enable display support for zx296718-evb board. - Remove pll_vga clock from ZX296718 device tree, as it's not a fixed rate clock. * tag 'zte-dt64-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: zte: add tvenc device for zx296718 arm64: dts: zte: add vou and hdmi devices for zx296718 arm64: dts: zte: add mmc devices for zx296718 arm64: dts: zte: remove zx296718 pll_vga clock Signed-off-by: Olof Johansson --- b42f45558e77724cb53e8885b26596ffa4f71434