tree 3f833f65236bd37ba26cf8399689d2da437b70df
parent c425b5c9bc31134e212b75c0d61b971ccf935846
parent 3536c97a52db2848d13512878c65affd98fd29db
author Olof Johansson <olof@lixom.net> 1437154498 -0700
committer Olof Johansson <olof@lixom.net> 1437154498 -0700

Merge branch 'depends/clk-rk3368' into next/arm64

Merge in dependent stable branch with clk driver for RK3368, needed for the
dt binding header files.

* depends/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

Signed-off-by: Olof Johansson <olof@lixom.net>