From: Arnd Bergmann Date: Mon, 28 Jul 2014 12:02:13 +0000 (+0200) Subject: Merge branch 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux into... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3fdef7e3bc6da0519eb1d76fa528ca088e12530e;p=linux-beck.git 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 --- 3fdef7e3bc6da0519eb1d76fa528ca088e12530e