]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'clk-rk3368' into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Mon, 6 Jul 2015 22:59:33 +0000 (15:59 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Wed, 8 Jul 2015 00:20:00 +0000 (17:20 -0700)
* clk-rk3368:
  clk: rockchip: add rk3368 clock controller
  clk: rockchip: add missing include guards
  clk: rockchip: add dt-binding header for rk3368
  dt-bindings: add documentation of rk3668 clock controller
  clk: rockchip: define the inverters of rk3066/rk3188 and rk3288
  clk: rockchip: fix issues in the mmc-phase clock
  clk: rockchip: add support for phase inverters
  clk: rockchip: add COMPOSITE_NOGATE_DIVTBL variant
  clk: rockchip: protect register macros against multipart values
  clk: rockchip: fix faulty vip parent name on rk3288
  clk: rockchip: rk3288: add CLK_SET_RATE_PARENT to sclk_mac


Trivial merge