Merge tag 'v4.5-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel...
authorStephen Boyd <sboyd@codeaurora.org>
Sat, 30 Jan 2016 01:24:28 +0000 (17:24 -0800)
committerStephen Boyd <sboyd@codeaurora.org>
Sat, 30 Jan 2016 01:24:28 +0000 (17:24 -0800)
commit60c7e2d2edc7a2a3613540e18760a713359946f6
tree5b3052c610a3bbd479cb5d0697a896619dd6f4f6
parenteac2d86d60449bc9852f94853cc156897fe9e893
parent8931f8e02979e4180566907019d432527c80abf7
Merge tag 'v4.5-rockchip-clkfixes1' of git://git./linux/kernel/git/mmind/linux-rockchip into clk-fixes

Pull rockchip fixes from Heiko Stuebner:

Fixes for wrong register offsets in both rk3036 and rk3368.
Also rename the external input for the emac on rk3036, which
should still be ok to do, as that binding was only introduced
during this merge-window.

* tag 'v4.5-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: rk3368: fix some clock gates
  clk: rockchip: rk3036: rename emac ext source clock
  clk: rockchip: rk3036: fix the div offset for emac clock
  clk: rockchip: rk3036: fix uarts clock error
  clk: rockchip: rk3036: fix the FLAGs for clock mux