]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge tag 'v5.1-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind...
authorStephen Boyd <sboyd@kernel.org>
Tue, 5 Feb 2019 22:07:52 +0000 (14:07 -0800)
committerStephen Boyd <sboyd@kernel.org>
Tue, 5 Feb 2019 22:07:52 +0000 (14:07 -0800)
Pull Rockchip clk driver updates from Heiko Stuebner:

Fix for PLL rate calculation on rk3328 and SET_RATE_PARENT flag
for the display clock on rk3066.

* tag 'v5.1-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: add CLK_SET_RATE_PARENT for rk3066 lcdc dclks
  clk: rockchip: fix frac settings of GPLL clock for rk3328


Trivial merge