Merge branch 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux into...
authorArnd Bergmann <arnd@arndb.de>
Mon, 28 Jul 2014 12:02:13 +0000 (14:02 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 28 Jul 2014 12:15:25 +0000 (14:15 +0200)
commit3fdef7e3bc6da0519eb1d76fa528ca088e12530e
tree01c26f9b119f85d5986e55ca2d847b0e5c63c9f2
parent55be3cf836ff295efe8968710654a31e18b88a28
parent1fe69496cf463b654d2d6e1a9a10fb8d99f10831
Merge branch 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux into next/soc

This is a dependency for the rk3288 DT updates, the branch should
first get merged through Mike's clk git.

* 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux:
  ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER
  clk: rockchip: add clock controller for rk3288
  dt-bindings: add documentation for rk3288 cru
  clk: rockchip: add clock driver for rk3188 and rk3066 clocks
  dt-bindings: add documentation for rk3188 clock and reset unit
  clk: rockchip: add reset controller
  clk: rockchip: add clock type for pll clocks and pll used on rk3066
  clk: rockchip: add basic infrastructure for clock branches
  clk: composite: improve rate_hw sanity check logic
  clk: composite: allow read-only clocks
  clk: composite: support determine_rate using rate_ops->round_rate + mux_ops->set_parent

Signed-off-by: Arnd Bergmann <arnd@arndb.de>