From: Stephen Boyd <sboyd@codeaurora.org>
Date: Tue, 21 Jun 2016 00:01:45 +0000 (-0700)
Subject: Merge tag 'v4.7-rockchip-clk-fixes1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~13272^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=086347705be7530feabb6274a3ad81dd545e7914;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'v4.7-rockchip-clk-fixes1' of git://git./linux/kernel/git/mmind/linux-rockchip into clk-fixes

A bunch of fixes. Some for the newly added rk3399 clock tree, some
concerning error handling and initialization and a revert of the
mmc-phase clock initialization, as this could conflict with the
bootloader setting of this clock and a real solution to initing
the phase correctly from dw_mmc went in as fix for 4.7 through
the mmc tree.

* tag 'v4.7-rockchip-clk-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: release io resource when failing to init clk on rk3399
  clk: rockchip: fix cpuclk registration error handling
  clk: rockchip: Revert "clk: rockchip: reset init state before mmc card initialization"
  clk: rockchip: fix incorrect parent for rk3399's {c,g}pll_aclk_perihp_src
  clk: rockchip: mark rk3399 GIC clocks as critical
  clk: rockchip: initialize flags of clk_init_data in mmc-phase clock
---

086347705be7530feabb6274a3ad81dd545e7914