Merge tag 'v4.6-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind...

Introduction of a factor type and a variant containing a gate
to be able to also declare factor clocks in their correct
place in the clock tree instead of having to register factor
clocks in the init callback separately. And as always some more
clock-ids and non-regression fixes for mistakes introduced in
past kernel releases.

diff --cc drivers/clk/rockchip/clk-rk3036.c
index bc7fbac,5759d75..0703c8f
--- 1/drivers/clk/rockchip/clk-rk3036.c
--- 2/drivers/clk/rockchip/clk-rk3036.c
+++ b/drivers/clk/rockchip/clk-rk3036.c
@@@ -349,8 -354,9 +354,9 @@@ static struct rockchip_clk_branch rk303
                        RK2928_CLKSEL_CON(21), 3, 1, MFLAGS),
  
        COMPOSITE_NOMUX(SCLK_MAC, "mac_clk", "mac_clk_ref", 0,
 -                      RK2928_CLKSEL_CON(21), 9, 5, DFLAGS,
 +                      RK2928_CLKSEL_CON(21), 4, 5, DFLAGS,
                        RK2928_CLKGATE_CON(2), 6, GFLAGS),
+       FACTOR(0, "sclk_macref_out", "hclk_peri_src", 0, 1, 2),
  
        MUX(SCLK_HDMI, "dclk_hdmi", mux_dclk_p, 0,
                        RK2928_CLKSEL_CON(31), 0, 1, MFLAGS),

diff --cc drivers/clk/rockchip/clk-rk3368.c
Simple merge

diff --cc drivers/clk/rockchip/clk.c
Simple merge