From: Arnd Bergmann Date: Wed, 13 May 2015 15:41:54 +0000 (+0200) Subject: Merge tag 'v4.2-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b424c7a0b4d6b54e7e6d09855bdf0b3929580cd;p=linux-beck.git Merge tag 'v4.2-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.2" from Heiko Stuebner: Some misc improvements defining additional supply regulators, enabling the Cortex-A12 HW PMU on the rk3288 and the tsadc on some more rk3288 boards, as well as some usb properties and marking the radxarock pmic as system-power-controller. * tag 'v4.2-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add system-power-controller to act8846 on radxarock ARM: dts: rockchip: add properties for dwc2 usb otg controller ARM: dts: rockchip: enable tsadc on rk3288 boards ARM: dts: rockchip: add act8846 supplies on rk3288-firefly ARM: dts: rockchip: Specify VMMC and VQMMC on rk3288-evb ARM: dts: rockchip: Enable Cortex-A12 HW PMU events on rk3288 --- 2b424c7a0b4d6b54e7e6d09855bdf0b3929580cd