From: Olof Johansson Date: Thu, 2 Apr 2015 00:52:46 +0000 (-0700) Subject: Merge tag 'v4.1-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind... X-Git-Tag: v4.1-rc1~50^2~34 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cdf77d767e0952bc45e45974c2874f4204993e83;p=linux.git Merge tag 'v4.1-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "ARM: rockchip: dts changes for 4.1" from Heiko Stuebner: This adds and enables the usbphy nodes on the rk3288 boards and enables the gmac on the firefly board. A new board the Popmetal-rk3288 is also added. And finally the pmic supplies for act8846 based boards are added, as the act8865/act8846 driver gained supply handling in the regulator tree. * tag 'v4.1-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: complete rk3288-evb pmic supplies ARM: dts: rockchip: add input supplies for the act8846 on Radxa Rock ARM: dts: add rk3288 PopMetal board dt-bindings: add root compatible property for PopMetal board ARM: dts: rockchip: enable gmac on rk3288-firefly ARM: dts: rockchip: enable usbphy on rk3288-firefly ARM: dts: rockchip: Enable usb PHY on rk3288-evb board ARM: dts: rockchip: add rk3288 usb PHY Signed-off-by: Olof Johansson --- cdf77d767e0952bc45e45974c2874f4204993e83