From: Olof Johansson Date: Tue, 15 May 2018 20:52:13 +0000 (-0700) Subject: Merge tag 'v4.18-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: android-x86-8.1-r1~875^2~35 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=823927bdb94a7682b6aed507045e276198134d0e;p=android-x86%2Fkernel.git Merge tag 'v4.18-rockchip-dts64-1' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt All iommus got their clocks added and rk3399 got support for its usb3-phy otg-port and better ajustment for the cpll child clocks. On the board side, all rk3399 got their typec phys enabled - which is needed for better usb support, the sapphire board got some more properties moved to the excavator baseboard where they really belong, kevin got a fix to use a real devicetree compatible and puma-haikou got its hdmi port enabled. * tag 'v4.18-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou arm64: dts: rockchip: use canonical compatible for touchpad/touchscreen on gru-kevin arm64: dts: rockchip: add clocks in iommu nodes arm64: dts: rockchip: add usb3-phy otg-port support for rk3399 arm64: dts: rockchip: remove PCIe assigned-clocks in excavator baseboard arm64: dts: rockchip: move rk3399-sapphire PCIe to excavator baseboard arm64: dts: rockchip: assign clock rate for cpll child clocks on rk3399 arm64: dts: rockchip: enable typec-phy0 for rk3399-puma-haikou arm64: dts: rockchip: enable typec-phy1 for rk3399-puma arm64: dts: rockchip: enable typec-phy for rk3399-firefly arm64: dts: rockchip: enable typec-phy for rk3399-sapphire Signed-off-by: Olof Johansson --- 823927bdb94a7682b6aed507045e276198134d0e