diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 17:41:54 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 17:41:54 +0200 |
commit | 2b424c7a0b4d6b54e7e6d09855bdf0b3929580cd (patch) | |
tree | 774311a5d47c5ce733d290ff4cc7fc88b5c60617 /Documentation | |
parent | 9d8a71ff5cb2025f4f56cdce2c7d5b426bad5247 (diff) | |
parent | 9ab79be0da98e371f1d2f9c01ac25745639718d1 (diff) |
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
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions